From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Nov 2007 22:00:36 +0000 (-0000)
Subject: Generalize the sed expression in filter_readonly_variables() so that
X-Git-Tag: v2.1.4~239
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d010b6c218a26097abe3bbdf49945289848845d9;p=portage.git

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
---

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