From 0c6e48265cc1e41eee864a358b6fc97f05804b62 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 1 Dec 2007 04:20:23 +0000 Subject: * whitelist PREROOTPATH in config.environ() * filter PREROOTPATH in save_ebuild_env() (trunk r8781) svn path=/main/branches/2.1.2/; revision=8782 --- bin/isolated-functions.sh | 3 ++- 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", ] -- cgit v1.2.3-1-g7c22