Make filter_readonly_variables() filter PATH in any case since

we never want to save of reload it. (trunk r9147)

svn path=/main/branches/2.1.2/; revision=9148

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f8ce260149f1f0e6e0a07dd0ee69775d02e4f8a7..8faa68f87ef4bff11e80e63293bf4e95c3cd3922 100755 (executable)
--- 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 e5f65e6983964650b952774cbb629c0ed8485d19..7228cbd77ef5b1a55206a126ba451d46ce8bfa95 100644 (file)
--- 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 \