From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Dec 2007 01:53:46 +0000 (-0000)
Subject: In filter_readonly_variables(), replace 'declare -r ' with 'declare '
X-Git-Tag: v2.2_pre1~197
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9d8b72f72055c0ba2eb6b6131ad1bd09d7a6e3d;p=portage.git

In filter_readonly_variables(), replace 'declare -r ' with 'declare '
instead of removing it completely.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index fbccce70c..45437bc2d 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1426,7 +1426,7 @@ filter_readonly_variables() {
 	# persisting in the saved environment can be inconvenient when it
 	# eventually needs to be reloaded.
 	egrep -v -e "${var_grep}" | sed \
-		-e 's:^declare[[:space:]]\+-r[[:space:]]\+::' \
+		-e 's:^declare[[:space:]]\+-r[[:space:]]\+:declare :' \
 		-e 's:^declare[[:space:]]\+-\([[:alnum:]]*\)r\([[:alnum:]]*\)[[:space:]]\+:declare -\1\2 :'
 }