diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-01 04:20:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-01 04:20:23 +0000 |
| commit | 0c6e48265cc1e41eee864a358b6fc97f05804b62 (patch) | |
| tree | d4f94847d681f7e1001c8a1d5d16fbfe32333f58 | |
| parent | 863859e809671dfbd7718d2becb8ee7ca3c74433 (diff) | |
| download | portage-0c6e48265cc1e41eee864a358b6fc97f05804b62.tar.gz portage-0c6e48265cc1e41eee864a358b6fc97f05804b62.tar.bz2 portage-0c6e48265cc1e41eee864a358b6fc97f05804b62.zip | |
* whitelist PREROOTPATH in config.environ()
* filter PREROOTPATH in save_ebuild_env()
(trunk r8781)
svn path=/main/branches/2.1.2/; revision=8782
| -rw-r--r-- | bin/isolated-functions.sh | 3 | ||||
| -rw-r--r-- | pym/portage.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index cbc325584..9ac0d2f3a 100644 --- 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 be46e5fe3..75ba2aa14 100644 --- 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", ] |