From b244da1bc0e76d101ca0be812b72f72f0f064455 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 Nov 2007 23:46:09 +0000
Subject: 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
---
 bin/ebuild.sh  | 6 ++++++
 pym/portage.py | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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):
-- 
cgit v1.2.3-1-g7c22