aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-16 15:23:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-16 15:23:19 +0000
commit0bbce622ad97bbf198ba87ac08ce01d29e65e731 (patch)
treefa60afed283bda9ef516d4ea0bb39c188178e8cb
parentdc324648869d60685c2b66217936bb16f52273b5 (diff)
downloadpaludis-0bbce622ad97bbf198ba87ac08ce01d29e65e731.tar.gz
paludis-0bbce622ad97bbf198ba87ac08ce01d29e65e731.tar.xz
Fix sandbox vdb issues
-rw-r--r--paludis/repositories/gentoo/ebuild/builtin_saveenv.bash1
-rwxr-xr-xpaludis/repositories/gentoo/ebuild/ebuild.bash2
2 files changed, 2 insertions, 1 deletions
diff --git a/paludis/repositories/gentoo/ebuild/builtin_saveenv.bash b/paludis/repositories/gentoo/ebuild/builtin_saveenv.bash
index 064c9b2..a3a4342 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_saveenv.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_saveenv.bash
@@ -25,6 +25,7 @@ builtin_saveenv()
-e '/^\(declare -[rx]\+ \)\?.\?[UP]ID/d' \
-e '/^\(declare -[rx]\+ \)\?BASH_VERSINFO/d' \
-e '/^\(declare -[rx]\+ \)\?PALUDIS_LOADSAVEENV_DIR/d' \
+ -e '/^\(declare -[rx]\+ \)\?PALUDIS_DO_NOTHING_SANDBOXY/d' \
-e '/^\(declare -[rx]\+ \)\?SHELLOPTS/d' \
-e '/^\(declare -[rx]\+ \)\?EBUILD_KILL_PID/d' \
-e 's:^declare -rx:declare -x:' \
diff --git a/paludis/repositories/gentoo/ebuild/ebuild.bash b/paludis/repositories/gentoo/ebuild/ebuild.bash
index 22ffde2..d637d68 100755
--- a/paludis/repositories/gentoo/ebuild/ebuild.bash
+++ b/paludis/repositories/gentoo/ebuild/ebuild.bash
@@ -156,7 +156,7 @@ ebuild_scrub_environment()
unset -v PATH ROOTPATH T PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL
unset -v PORTDIR FILESDIR ECLASSDIR DISTDIR PALUDIS_EBUILD_DIR
unset -v PALUDIS_EXTRA_DIE_MESSAGE PALUDIS_COMMAND PALUDIS_CLIENT
- unset -v PALUDIS_LOADSAVEENV_DIR
+ unset -v PALUDIS_LOADSAVEENV_DIR SKIP_FUNCTIONS PALUDIS_DO_NOTHING_SANDBOXY
unset -v ${!PALUDIS_CMDLINE_*} PALUDIS_OPTIONS
unset -v ${!CONTRARIUS_CMDLINE_*} CONTRARIUS_OPTIONS