diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-01-05 22:00:45 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-01-05 22:00:45 +0000 |
commit | 9eef91b3473080981d9157463df125a5be2b6455 (patch) | |
tree | a625fa98fcff32228dd30711c64375fd67a4900d | |
parent | 43a45b8f3bdc37f252cee9a3b22b0ada8f76d870 (diff) | |
download | portage-9eef91b3473080981d9157463df125a5be2b6455.tar.gz portage-9eef91b3473080981d9157463df125a5be2b6455.tar.bz2 portage-9eef91b3473080981d9157463df125a5be2b6455.zip |
Make filter_readonly_variables() filter PATH in any case since
we never want to save of reload it.
svn path=/main/trunk/; revision=9147
-rwxr-xr-x | bin/ebuild.sh | 4 | ||||
-rwxr-xr-x | bin/isolated-functions.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index f8ce26014..8faa68f87 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1408,14 +1408,14 @@ filter_readonly_variables() { SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB SANDBOX_LOG SANDBOX_ON" filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS} - BASH_[_[:alnum:]]*" + BASH_[_[:alnum:]]* PATH" if hasq --filter-sandbox $* ; then filtered_vars="${filtered_vars} SANDBOX_[_[:alnum:]]*" else filtered_vars="${filtered_vars} ${filtered_sandbox_vars}" fi if hasq --filter-features $* ; then - filtered_vars="${filtered_vars} FEATURES PATH" + filtered_vars="${filtered_vars} FEATURES" fi if ! hasq --allow-extra-vars $* ; then filtered_vars=" diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index e5f65e698..7228cbd77 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -460,7 +460,7 @@ save_ebuild_env() { ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \ GOOD HILITE HOME IMAGE \ LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \ - NORMAL PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ + NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \ PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ |