From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 23 Nov 2007 01:37:58 +0000 (-0000)
Subject: Make the sed expression in filter_readonly_variables() handle
X-Git-Tag: v2.2_pre1~344
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe2487d0d36d8e90ff2554c7b475874e392882b9;p=portage.git

Make the sed expression in filter_readonly_variables() handle
'^declare -r ' by simply removing it.

svn path=/main/trunk/; revision=8611
---

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