Remove obsolete backing up of ROOTPATH via PORTAGE_ROOTPATH. (trunk r15143)

svn path=/main/branches/2.1.7/; revision=15144

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b53295becb19ed40c226bcd85baff04381cb9531..2cc31a58650ef1513a73cffcc0bf96e98b893359 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -23,13 +23,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 67f68ff8f0af8c4e8cad3dc214cd6c3ffc5e1981..0c03dcb6c92cde6de8f379b0c09e2c7a6654138d 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):