From 99906eb21a7b93836a0bef58862df128dbaf92b0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Mar 2008 11:50:48 +0000 Subject: Use os.environ["SANDBOX_ON"] = "0" to make portageq exempt from sandbox for things like writing metadata cache. Thanks to ferringb for the suggestion. (trunk r9448) svn path=/main/branches/2.1.2/; revision=9550 --- bin/ebuild.sh | 2 +- bin/portageq | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 23d0b619a..6df1af492 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 d65abaa8f..f0c2e19e2 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 import portage_exception #----------------------------------------------------------------------------- -- cgit v1.2.3-1-g7c22