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