diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-22 11:39:32 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-22 11:39:32 -0800 |
| commit | 8d524638e4e664a684d781181a09eee3de12319c (patch) | |
| tree | 3bc38cdc509e5d4520284180b53ec62802066e3c | |
| parent | a34586a73724d6075a556f82a05fc16893db31e0 (diff) | |
| download | portage-8d524638e4e664a684d781181a09eee3de12319c.tar.gz portage-8d524638e4e664a684d781181a09eee3de12319c.tar.bz2 portage-8d524638e4e664a684d781181a09eee3de12319c.zip | |
filter_readonly_variables: refactor binpkg logic
| -rw-r--r-- | bin/phase-functions.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 7407aba93..2167853dc 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -126,14 +126,15 @@ filter_readonly_variables() { LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_PAPER LC_TIME" fi - if [[ ${EMERGE_FROM} != binary ]] && ! has --allow-extra-vars $* ; then - filtered_vars=" - ${filtered_vars} - ${PORTAGE_SAVED_READONLY_VARS} - ${PORTAGE_MUTABLE_FILTERED_VARS} - " - elif ! has --allow-extra-vars $* ; then - filtered_vars+=" ${binpkg_untrusted_vars}" + if ! has --allow-extra-vars $* ; then + if [ "${EMERGE_FROM}" = binary ] ; then + # preserve additional variables from build time, + # while excluding untrusted variables + filtered_vars+=" ${binpkg_untrusted_vars}" + else + filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}" + filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}" + fi fi "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" |