Remove obsolete backing up of ROOTPATH via PORTAGE_ROOTPATH.

svn path=/main/trunk/; revision=15143

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6f6280585ce0c6b21dae248f1b878e3e10a26b83..f56dc9485235fa016a7d8a64d0260662d49ef04d 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -17,13 +17,7 @@ for x in TEMP TMP TMPDIR ; do
 done
 unset x
 
-# sandbox's bashrc sources /etc/profile which 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
-
+echo ROOTPATH=$ROOTPATH
 ROOTPATH=${ROOTPATH##:}
 ROOTPATH=${ROOTPATH%%:}
 PREROOTPATH=${PREROOTPATH##:}

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 04f5cea521b55c974cd2d9732b3f273ae2ec9289..7cc2b237f7ddb69985e37d6316d2d46d06a06495 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3782,12 +3782,6 @@ class config(object):
                        mydict.pop("EPREFIX", None)
                        mydict.pop("EROOT", None)
 
-               # sandbox's bashrc sources /etc/profile which 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):