summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-06 02:33:04 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-06 02:33:04 +0000
commit604fcc64957a466b38ef451c54e7a0005e1cd4a8 (patch)
tree0e569d2c209bcda0b47d290fe9929137d2d5540e
parent33ac92965f17401fc02093f2363100ff2ed9734d (diff)
downloadportage-604fcc64957a466b38ef451c54e7a0005e1cd4a8.tar.gz
portage-604fcc64957a466b38ef451c54e7a0005e1cd4a8.tar.bz2
portage-604fcc64957a466b38ef451c54e7a0005e1cd4a8.zip
Use os.environ["SANDBOX_ON"] = "0" to make portageq exempt from sandbox for
things like writing metadata cache. Thanks to ferringb for the suggestion. svn path=/main/trunk/; revision=9448
-rwxr-xr-xbin/ebuild.sh2
-rwxr-xr-xbin/portageq4
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b33911d4d..754406b46 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -7,7 +7,7 @@ PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/dev/random"
-export SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_PYM_PATH}:${PORTAGE_DEPCACHEDIR}"
+export SANDBOX_PREDICT
export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:/dev/stdout:/dev/stderr:${PORTAGE_TMPDIR}"
export SANDBOX_READ="${SANDBOX_READ}:/:/dev/shm:/dev/stdin:${PORTAGE_TMPDIR}"
# Don't use sandbox's BASH_ENV for new shells because it does
diff --git a/bin/portageq b/bin/portageq
index c3fe8b37d..eb0d0ff69 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -21,6 +21,10 @@ except KeyboardInterrupt:
import os
+# This allows portageq to be exempt from sandbox,
+# for things like updating metadata cache.
+os.environ["SANDBOX_ON"] = "0"
+
import types
#-----------------------------------------------------------------------------