diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-24 04:40:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-24 04:40:22 +0000 |
| commit | e38927342cc23d18d7f650debf406dc16153a706 (patch) | |
| tree | cf0dfa9bd9f3a8183a927e368597a8f0b48a1f0b | |
| parent | eb1de6c26edabe4e4d5babe031e09d86d087e0dc (diff) | |
| download | portage-e38927342cc23d18d7f650debf406dc16153a706.tar.gz portage-e38927342cc23d18d7f650debf406dc16153a706.tar.bz2 portage-e38927342cc23d18d7f650debf406dc16153a706.zip | |
Remove obsolete backing up of ROOTPATH via PORTAGE_ROOTPATH. (trunk r15143)
svn path=/main/branches/2.1.7/; revision=15144
| -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 b53295bec..2cc31a586 100755 --- 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 67f68ff8f..0c03dcb6c 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): |