aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-29 00:43:39 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-29 00:43:39 +0000
commit92e4730de9a00f44932e1ceefa671abf85091f13 (patch)
tree8304fb7782f6253673867d5cca187f2225f2e1f4
parentacb7dccb5ed48c50da05850bf96d5cf2707b2227 (diff)
downloadpaludis-92e4730de9a00f44932e1ceefa671abf85091f13.tar.gz
paludis-92e4730de9a00f44932e1ceefa671abf85091f13.tar.xz
r3658@snowflake: ciaranm | 2007-06-29 01:43:25 +0100
Also filter BASH_REMATCH. Fixes: ticket:288. From: Radosław Szkodziński
-rw-r--r--paludis/repositories/e/ebuild/builtin_saveenv.bash1
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
2 files changed, 2 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild/builtin_saveenv.bash b/paludis/repositories/e/ebuild/builtin_saveenv.bash
index 097578f..3bdda46 100644
--- a/paludis/repositories/e/ebuild/builtin_saveenv.bash
+++ b/paludis/repositories/e/ebuild/builtin_saveenv.bash
@@ -23,6 +23,7 @@ builtin_saveenv()
( set ; export -p ) | sed \
-e '/^\(declare -[rx]\+ \)\?SANDBOX_/d' \
-e '/^\(declare -[rx]\+ \)\?.\?[UP]ID/d' \
+ -e '/^\(declare -[rx]\+ \)\?BASH_REMATCH/d' \
-e '/^\(declare -[rx]\+ \)\?BASH_VERSINFO/d' \
-e '/^\(declare -[rx]\+ \)\?PALUDIS_LOADSAVEENV_DIR/d' \
-e '/^\(declare -[rx]\+ \)\?PALUDIS_DO_NOTHING_SANDBOXY/d' \
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 4c2a59f..44829d3 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -179,7 +179,7 @@ ebuild_scrub_environment()
{
local filters=(
-e '/^\(EU\|PP\|U\)ID=/d'
- -e '/^BASH_\(ARGC\|ARGV\|LINENO\|SOURCE\|VERSINFO\)=/d'
+ -e '/^BASH_\(ARGC\|ARGV\|LINENO\|SOURCE\|VERSINFO\|REMATCH\)=/d'
-e '/^BASH_COMPLETION\(_DIR\)\?=/d'
-e '/^PALUDIS_SOURCE_MERGED_VARIABLES=/d'
-e '/^bash[0-9]\+[a-z]\?=/d'