summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-13 03:44:18 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-13 03:44:18 +0000
commit5ea185c01922d5725dce04ad7dbdc903960ee435 (patch)
tree0e168047244f2a686e3e2b3107e75ae2efcffdad /bin/ebuild.sh
parentIn filter_readonly_variables(), replace 'declare -r ' with 'declare ' (diff)
downloadportage-multirepo-5ea185c01922d5725dce04ad7dbdc903960ee435.tar.gz
portage-multirepo-5ea185c01922d5725dce04ad7dbdc903960ee435.tar.bz2
portage-multirepo-5ea185c01922d5725dce04ad7dbdc903960ee435.zip
Bug #202068 - In order to filter unwanted variable assignments out
of the bash environment, use a filter-bash-environment.py script that behaves similar to egrep -v except that it leaves bash here- documents intact. svn path=/main/trunk/; revision=8892
Diffstat (limited to 'bin/ebuild.sh')
-rwxr-xr-xbin/ebuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 45437bc2..5e09daa6 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1425,7 +1425,7 @@ filter_readonly_variables() {
# listed in READONLY_EBUILD_METADATA, since having any readonly attributes
# persisting in the saved environment can be inconvenient when it
# eventually needs to be reloaded.
- egrep -v -e "${var_grep}" | sed \
+ "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${var_grep}" | sed \
-e 's:^declare[[:space:]]\+-r[[:space:]]\+:declare :' \
-e 's:^declare[[:space:]]\+-\([[:alnum:]]*\)r\([[:alnum:]]*\)[[:space:]]\+:declare -\1\2 :'
}