aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-13 20:19:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-13 20:19:19 +0000
commit496bef333bd1a7d544e3057dd2e004da2b6dcb7d (patch)
treefacf0d4735c61249e253aac73a6f26e909f95794
parenta1dae9c1467bb8ca2ae040286677ee35c2cf5163 (diff)
downloadpaludis-496bef333bd1a7d544e3057dd2e004da2b6dcb7d.tar.gz
paludis-496bef333bd1a7d544e3057dd2e004da2b6dcb7d.tar.xz
When ROOT=/ and unmerging a Portage-installed package, avoid sandbox errors caused by the saved environment (take two)
-rwxr-xr-xebuild/ebuild.bash26
1 files changed, 13 insertions, 13 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index 1f4c031..8b70d32 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 '/^ROOTPATH=/d' \
- -e '/^PATH=/d' \
- -e '/^T=/d' \
- -e '/^PALUDIS_TMPDIR=/d' \
- -e '/^PALUDIS_EBUILD_LOG_LEVEL=/d' \
- -e '/^PORTDIR=/d' \
- -e '/^FILESDIR=/d' \
- -e '/^ECLASSDIR=/d' \
- -e '/^DISTDIR=/d' \
- -e '/^PALUDIS_EBUILD_DIR=/d' \
- -e '/^PALUDIS_COMMAND=/d' \
- -e '/^ROOT=/d' \
- -e '/^SANDBOX/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' \
"${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}"
source "${PALUDIS_TMPDIR}/environment-${CATEGORY}-${PF}" &>/dev/null \