From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 3 Jan 2008 15:39:30 +0000 (-0000)
Subject: Recognize export statements when filtering the environment. This
X-Git-Tag: v2.1.4~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a38336eab540d0d823234ca861b4dc2ad30781ec;p=portage.git

Recognize export statements when filtering the environment. This
is needed for compatibility with environment.bz2 files generated
by paludis. (trunk r9137)

svn path=/main/branches/2.1.2/; revision=9138
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 51b0b5f2f..d625adf6e 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1430,7 +1430,7 @@ filter_readonly_variables() {
 	done
 	set +f
 	var_grep=${var_grep:1} # strip the first |
-	var_grep="(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)(${var_grep})=.*"
+	var_grep="(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+|^export[[:space:]]+)(${var_grep})=.*"
 	# The sed is to remove the readonly attribute from variables such as those
 	# listed in READONLY_EBUILD_METADATA, since having any readonly attributes
 	# persisting in the saved environment can be inconvenient when it