summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-07 08:31:48 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-07 08:31:48 +0000
commitb285810b230aa7cfef759c85f5b7b091965f91b7 (patch)
tree8f5d4056d4078f2b70f710acee031bf8048d422d
parentMake quickpkg respect PORTAGE_NICENESS. (diff)
downloadportage-multirepo-2.1.1.tar.gz
portage-multirepo-2.1.1.tar.bz2
portage-multirepo-2.1.1.zip
Add PORTAGE_DEPCACHEDIR to SANDBOX_PREDICT since it's legitimate for portageq calls to trigger cache writes. See bug #144011.v2.1.1
svn path=/main/trunk/; revision=4425
-rwxr-xr-xbin/ebuild.sh3
-rw-r--r--pym/portage.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f9d4b5be..b82c2c02 100755
--- 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 4899295d..fa2ac9cd 100644
--- 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: