diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-12-01 04:19:20 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-12-01 04:19:20 +0000 |
commit | 87c5dd704e2e3d1031560150a8b8ef329c0abda8 (patch) | |
tree | 08b53fa363005f4b500b559413b37ce81bca8704 | |
parent | c5f1846fceb8022a62f8525d0ecf3cf4a33b5adb (diff) | |
download | portage-87c5dd704e2e3d1031560150a8b8ef329c0abda8.tar.gz portage-87c5dd704e2e3d1031560150a8b8ef329c0abda8.tar.bz2 portage-87c5dd704e2e3d1031560150a8b8ef329c0abda8.zip |
* whitelist PREROOTPATH in config.environ()
* filter PREROOTPATH in save_ebuild_env()
svn path=/main/trunk/; revision=8781
-rwxr-xr-x | bin/isolated-functions.sh | 3 | ||||
-rw-r--r-- | pym/portage/__init__.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index cbc325584..9ac0d2f3a 100755 --- 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/__init__.py b/pym/portage/__init__.py index 84ff78f39..204170038 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -868,7 +868,7 @@ class config(object): "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", ] |