diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-23 01:39:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-23 01:39:11 +0000 |
| commit | b727aa2ee661446f653e23475eb122f8fe37aa9b (patch) | |
| tree | 50d83a4fcd403fa57d65f5ad963da5d84834dae0 /bin/ebuild.sh | |
| parent | bc55ce47217542610f9a4ccb50d7e8ca38841178 (diff) | |
| download | portage-b727aa2ee661446f653e23475eb122f8fe37aa9b.tar.gz portage-b727aa2ee661446f653e23475eb122f8fe37aa9b.tar.bz2 portage-b727aa2ee661446f653e23475eb122f8fe37aa9b.zip | |
Make the sed expression in filter_readonly_variables() handle
'^declare -r ' by simply removing it. (trunk r8611)
svn path=/main/branches/2.1.2/; revision=8612
Diffstat (limited to 'bin/ebuild.sh')
| -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 |