diff options
| -rwxr-xr-x | bin/ebuild.sh | 8 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 6f6280585..f56dc9485 100755 --- 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 04f5cea52..7cc2b237f 100644 --- 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): |