aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-16 16:24:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-16 16:24:20 +0000
commit42e8a18f65c2e8851e83b12f172b69161a8f3880 (patch)
tree963a391f1147259817cf1f50c527a73405e5eb06
parent7e3050875d1d1b9be634f894bf2ca08e651311bd (diff)
downloadpaludis-42e8a18f65c2e8851e83b12f172b69161a8f3880.tar.gz
paludis-42e8a18f65c2e8851e83b12f172b69161a8f3880.tar.xz
Don't sandbox unmerging from /, to work around a sandbox feature
-rw-r--r--ebuild/builtin_unmerge.bash3
1 files changed, 3 insertions, 0 deletions
diff --git a/ebuild/builtin_unmerge.bash b/ebuild/builtin_unmerge.bash
index c202f7d..b699927 100644
--- a/ebuild/builtin_unmerge.bash
+++ b/ebuild/builtin_unmerge.bash
@@ -60,6 +60,8 @@ ebuild_f_unmerge()
{
local old_sandbox_write="${SANDBOX_WRITE}"
SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
+ local old_sandbox_on="${SANDBOX_ON}"
+ [[ "$(readlink -f ${ROOT} )" != "/" ]] || SANDBOX_ON=0
if hasq "unmerge" ${RESTRICT} ; then
ebuild_section "Skipping builtin_unmerge (RESTRICT)"
@@ -72,6 +74,7 @@ ebuild_f_unmerge()
fi
SANDBOX_WRITE="${old_sandbox_write}"
+ SANDBOX_ON="${old_sandbox_on}"
}