Update comments about ROOTPATH:

sandbox's bashrc sources /etc/profile which unsets ROOTPATH,
so we have to back it up and restore it. (trunk r8775:8777)

svn path=/main/branches/2.1.2/; revision=8778

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 128a7d6cc45bbf008f7e796bac2265657c80c64e..2f015d3a696860d75f765e278dd152ff2bc5f139 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -15,7 +15,8 @@ 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.
+# 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

diff --git a/pym/portage.py b/pym/portage.py
index db3a415ad8b473f2571d38b7a6c45a3f40a6183b..ee39a537dbaa6d7a760c86d68c93823d7c687653 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2565,7 +2565,8 @@ class config:
                                        if v is not None:
                                                mydict[k] = v
 
-               # sandbox unsets ROOTPATH, so we have to back it up and restore it.
+               # 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