aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-07 14:18:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-07 14:18:19 +0000
commit191fb4503ac89a0feace1dd99ff0a09461f16bc3 (patch)
treef6eab4e37965c80234b9859591c50d157775d2fb
parentb540511991fdf3c5d7e362bccfa351c7e14eb458 (diff)
downloadpaludis-191fb4503ac89a0feace1dd99ff0a09461f16bc3.tar.gz
paludis-191fb4503ac89a0feace1dd99ff0a09461f16bc3.tar.xz
Switch off sandbox when merging to / to avoid sandbox getting upset when its own files get replaced. Fixes: Berlios#7402.
-rw-r--r--ebuild/builtin_merge.bash3
1 files changed, 3 insertions, 0 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index 24dde16..39cf0bb 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -82,6 +82,8 @@ ebuild_f_merge()
{
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 "merge" ${RESTRICT} ; then
ebuild_section "Skipping builtin_merge (RESTRICT)"
@@ -94,5 +96,6 @@ ebuild_f_merge()
fi
SANDBOX_WRITE="${old_sandbox_write}"
+ SANDBOX_ON="${old_sandbox_on}"
}