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 51b0b5f2f150ae944c24f1910b8ce44cc4e42e50..d625adf6ee01761a620a4385c83c68dfd6c0003b 100755 (executable)
--- 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