aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-13 20:20:45 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-13 20:20:45 +0000
commit348a1029365f949f39c44b77ea32a25f9094f09e (patch)
tree078935f127fdcdf9e65d3d2cb484b14bc47bdb47
parent496bef333bd1a7d544e3057dd2e004da2b6dcb7d (diff)
downloadpaludis-348a1029365f949f39c44b77ea32a25f9094f09e.tar.gz
paludis-348a1029365f949f39c44b77ea32a25f9094f09e.tar.xz
When ROOT=/ and unmerging a Portage-installed package, avoid sandbox errors caused by the saved environment (cleaner regex)
-rwxr-xr-xebuild/ebuild.bash26
1 files changed, 13 insertions, 13 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index 8b70d32..659b113 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -149,19 +149,19 @@ ebuild_load_ebuild()
sed -i \
-e '/^diefunc ()/,/^}/d' \
-e '/^perform_hook ()/,/^}/d' \
- -e '/^\(declare[^A-Z]\+ \)\?ROOTPATH=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?PATH=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?T=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?PALUDIS_TMPDIR=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?PALUDIS_EBUILD_LOG_LEVEL=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?PORTDIR=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?FILESDIR=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?ECLASSDIR=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?DISTDIR=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?PALUDIS_EBUILD_DIR=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?PALUDIS_COMMAND=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?ROOT=/d' \
- -e '/^\(declare[^A-Z]\+ \)\?SANDBOX/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?ROOTPATH=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PATH=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?T=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_TMPDIR=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_EBUILD_LOG_LEVEL=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PORTDIR=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?FILESDIR=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?ECLASSDIR=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?DISTDIR=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_EBUILD_DIR=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_COMMAND=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?ROOT=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?SANDBOX/d' \
"${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}"
source "${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}" &>/dev/null \