summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-30 23:46:09 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-30 23:46:09 +0000
commitb244da1bc0e76d101ca0be812b72f72f0f064455 (patch)
treecdd41ab1ed231eb72662264c318f394370028bab
parentefda32534112b27e56a1be94e9af41beb39b611d (diff)
downloadportage-b244da1bc0e76d101ca0be812b72f72f0f064455.tar.gz
portage-b244da1bc0e76d101ca0be812b72f72f0f064455.tar.bz2
portage-b244da1bc0e76d101ca0be812b72f72f0f064455.zip
sandbox unsets ROOTPATH, so we have to back it up on the python
side then restore it on the bash side. (trunk r8768) svn path=/main/branches/2.1.2/; revision=8769
-rwxr-xr-xbin/ebuild.sh6
-rw-r--r--pym/portage.py7
2 files changed, 12 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 2a5a1a53d..bf9716acb 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -15,6 +15,12 @@ export SANDBOX_READ="${SANDBOX_READ}:/dev/shm:/dev/stdin:${PORTAGE_TMPDIR}"
# environment by modifying our PATH.
unset BASH_ENV
+# sandbox unsets ROOTPATH, so we have to back it up and restore it.
+if [ -n ${PORTAGE_ROOTPATH} ] ; then
+ export ROOTPATH=${PORTAGE_ROOTPATH}
+ unset PORTAGE_ROOTPATH
+fi
+
if [ ! -z "${PORTAGE_GPG_DIR}" ]; then
SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_GPG_DIR}"
fi
diff --git a/pym/portage.py b/pym/portage.py
index fe8088e4c..478ec235d 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1007,7 +1007,7 @@ class config:
"FEATURES", "PORTAGE_BIN_PATH",
"PORTAGE_CONFIGROOT", "PORTAGE_DEPCACHEDIR",
"PORTAGE_GID", "PORTAGE_INST_GID", "PORTAGE_INST_UID",
- "PORTAGE_PYM_PATH", "PORTDIR_OVERLAY", "ROOT", "USE_ORDER",
+ "PORTAGE_PYM_PATH", "PORTDIR_OVERLAY", "ROOT", "ROOTPATH", "USE_ORDER",
"XARGS",
]
@@ -2565,6 +2565,11 @@ class config:
if v is not None:
mydict[k] = v
+ # sandbox unsets ROOTPATH, so we have to back it up and restore it.
+ rootpath = mydict.get("ROOTPATH")
+ if rootpath:
+ mydict["PORTAGE_ROOTPATH"] = rootpath
+
return mydict
def thirdpartymirrors(self):