* whitelist PREROOTPATH in config.environ()

* filter PREROOTPATH in save_ebuild_env()
(trunk r8781)

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

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index cbc32558452d0a8a383b904516775252ea55b4a8..9ac0d2f3a47cb090efb7d414a149318ddce355ec 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -431,7 +431,8 @@ save_ebuild_env() {
                        PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
                        PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
                        PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_WORKDIR_MODE PORTDIR \
-                       PORTDIR_OVERLAY PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \
+                       PORTDIR_OVERLAY PREROOTPATH \
+                       PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \
                        RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \
                        RC_INDENTATION READONLY_EBUILD_METADATA READONLY_PORTAGE_VARS \
                        ROOT ROOTPATH RPMDIR STARTDIR TMP TMPDIR USE_EXPAND \

diff --git a/pym/portage.py b/pym/portage.py
index be46e5fe36010137087f2f3d370989cc2b1082af..75ba2aa14a651563ff9a2aeb89c0d55e9d5f2121 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1008,7 +1008,7 @@ class config:
                "PORTAGE_CONFIGROOT", "PORTAGE_DEPCACHEDIR",
                "PORTAGE_GID", "PORTAGE_INST_GID", "PORTAGE_INST_UID",
                "PORTAGE_PYM_PATH", "PORTAGE_WORKDIR_MODE",
-               "PORTDIR", "PORTDIR_OVERLAY",
+               "PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH",
                "ROOT", "ROOTPATH", "USE_ORDER",
                "XARGS",
        ]