diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-23 01:37:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-23 01:37:58 +0000 |
| commit | fe2487d0d36d8e90ff2554c7b475874e392882b9 (patch) | |
| tree | 7105f3a8c752a4c8c95fd215feebe6754c0d5992 /bin | |
| parent | 094832c9dbc5b29d34af7ce1e6f36c7a3e861033 (diff) | |
| download | portage-fe2487d0d36d8e90ff2554c7b475874e392882b9.tar.gz portage-fe2487d0d36d8e90ff2554c7b475874e392882b9.tar.bz2 portage-fe2487d0d36d8e90ff2554c7b475874e392882b9.zip | |
Make the sed expression in filter_readonly_variables() handle
'^declare -r ' by simply removing it.
svn path=/main/trunk/; revision=8611
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 20d08e3e3..8124a1511 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1394,7 +1394,9 @@ 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 's:^declare[[:space:]]\+-\([[:alnum:]]*\)r\([[:alnum:]]*\)[[:space:]]\+:declare -\1\2 :' + egrep -v -e "${var_grep}" | sed \ + -e 's:^declare[[:space:]]\+-r[[:space:]]\+::' \ + -e 's:^declare[[:space:]]\+-\([[:alnum:]]*\)r\([[:alnum:]]*\)[[:space:]]\+:declare -\1\2 :' } # @FUNCTION: preprocess_ebuild_env |