Add PORTAGE_DEPCACHEDIR to SANDBOX_PREDICT since it's legitimate for portageq calls...

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f9d4b5bea348fe139f1a243c919513edb1fcc103..b82c2c02e650e17d0f7804d228988ed1f3898a19 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -7,7 +7,8 @@ PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
 PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
 declare -rx PORTAGE_BIN_PATH PORTAGE_PYM_PATH
 
-export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:${PORTAGE_PYM_PATH}:/dev/random"
+SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/dev/random"
+export SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_PYM_PATH}:${PORTAGE_DEPCACHEDIR}"
 export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:/dev/stdout:/dev/stderr:${PORTAGE_TMPDIR}"
 export SANDBOX_READ="${SANDBOX_READ}:/dev/shm:/dev/stdin:${PORTAGE_TMPDIR}"
 

diff --git a/pym/portage.py b/pym/portage.py
index 4899295d6f89274922f037a857ff47ee251a09c4..fa2ac9cdbdd35291336e690479aaff475a1fdf0c 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1204,8 +1204,8 @@ class config:
 
                        if self.get("PORTAGE_DEPCACHEDIR", None):
                                self.depcachedir = self["PORTAGE_DEPCACHEDIR"]
-                               while "PORTAGE_DEPCACHEDIR" in self:
-                                       del self["PORTAGE_DEPCACHEDIR"]
+                       self["PORTAGE_DEPCACHEDIR"] = self.depcachedir
+                       self.backup_changes("PORTAGE_DEPCACHEDIR")
 
                        overlays = self.get("PORTDIR_OVERLAY","").split()
                        if overlays: