diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-22 22:00:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-22 22:00:36 +0000 |
| commit | d010b6c218a26097abe3bbdf49945289848845d9 (patch) | |
| tree | f261f5bcf92c4d4507264b8f40b06fe829da9084 /bin/ebuild.sh | |
| parent | c36023833c7b58812fba559f89e418ce7d24ac44 (diff) | |
| download | portage-d010b6c218a26097abe3bbdf49945289848845d9.tar.gz portage-d010b6c218a26097abe3bbdf49945289848845d9.tar.bz2 portage-d010b6c218a26097abe3bbdf49945289848845d9.zip | |
Generalize the sed expression in filter_readonly_variables() so that
it will work with things like 'declare -xr' as well as 'declare -rx'.
(trunk r8605)
svn path=/main/branches/2.1.2/; revision=8606
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index e03b18fa3..8ad15241d 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1394,7 +1394,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 's:^declare -rx:declare -x:' + egrep -v -e "${var_grep}" | sed 's:^declare[[:space:]]\+-\([[:alnum:]]*\)r\([[:alnum:]]*\)[[:space:]]\+:declare -\1\2 :' } # @FUNCTION: preprocess_ebuild_env |