From b7e91fab9e107c69729298f21e137c22713f8527 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 7 Sep 2010 17:57:03 -0700 Subject: Filter the FEATURES variable out of the environment between phases, so that it always matches the latest value from the config class and it can never be stale. With the ability to use package.env for per-package FEATURES settings, there's no need for bashrc to make persistent modifications to the FEATURES variable. --- bin/ebuild.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 171b9c6f4..cc3b4a142 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1833,7 +1833,7 @@ preprocess_ebuild_env() { ) > "${T}/environment.filtered" local retval if [ -e "${T}/environment.success" ] ; then - filter_readonly_variables < \ + filter_readonly_variables --filter-features < \ "${T}/environment.filtered" > "${T}/environment" retval=$? else @@ -2314,7 +2314,8 @@ elif [[ -n $EBUILD_SH_ARGS ]] ; then # Save the env only for relevant phases. if ! hasq "$EBUILD_SH_ARGS" clean help info nofetch ; then umask 002 - save_ebuild_env | filter_readonly_variables > "$T/environment" + save_ebuild_env | filter_readonly_variables \ + --filter-features > "$T/environment" assert "save_ebuild_env failed" chown portage:portage "$T/environment" &>/dev/null chmod g+w "$T/environment" &>/dev/null -- cgit v1.2.3-1-g7c22