aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-01-28 16:58:21 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-01-28 16:58:21 +0000
commitfbb9ac200586f35b10d3f15734c29d2596063f28 (patch)
tree4ed04045bfcf134306128f08af6639da04a5d7a2
parent76fc5f762ffd2ef4089c412145a71730bcbba9df (diff)
downloadpaludis-fbb9ac200586f35b10d3f15734c29d2596063f28.tar.gz
paludis-fbb9ac200586f35b10d3f15734c29d2596063f28.tar.xz
Only strip variables from known clients, to avoid clobbering similarly-named variables from ebuilds.
-rwxr-xr-xebuild/ebuild.bash6
1 files changed, 4 insertions, 2 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index e0654fd..5be8bcf 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -206,8 +206,10 @@ ebuild_load_ebuild()
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_EBUILD_DIR=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_COMMAND=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_CLIENT=/d' \
- -e '/^\(declare \(-[^ ]\+ \)\?\)\?[^=]*_CMDLINE_.*=/d' \
- -e '/^\(declare \(-[^ ]\+ \)\?\)\?[^=]*_OPTIONS=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?\(PALUDIS\|CONTRARIUS\|GTKPALUDIS\)_CMDLINE_.*=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?\(ADJUTRIX\|QUALUDIS\)_CMDLINE_.*=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?\(PALUDIS\|CONTRARIUS\|GTKPALUDIS\)_OPTIONS=/d' \
+ -e '/^\(declare \(-[^ ]\+ \)\?\)\?\(ADJUTRIX\|QUALUDIS\)_OPTIONS=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_HOME=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?PALUDIS_PID=/d' \
-e '/^\(declare \(-[^ ]\+ \)\?\)\?EBUILD_KILL_PID=/d' \