In preprocess_ebuild_env(), move a filter_readonly_variables call

out of a subshell since FreeBSD and prefix users have reported
apparent corruption of the PATH environment variable that triggers
calls to the wrong version of sed (one that does not support the
-r option). (trunk r9193:9195)

svn path=/main/branches/2.1.2/; revision=9196

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ef21d222d696252edacc936f04f1287cbbb1b351..1bcd02852e536e5f585646be965eeced44e4e335 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1486,10 +1486,11 @@ preprocess_ebuild_env() {
                # and functions that could interfere with the current environment.
                save_ebuild_env || exit $?
                touch "${T}/environment.success" || exit $?
-       ) | filter_readonly_variables > "${T}/environment.filtered"
+       ) > "${T}/environment.filtered"
        local retval
        if [ -e "${T}/environment.success" ] ; then
-               mv "${T}/environment.filtered" "${T}/environment"
+               filter_readonly_variables < \
+                       "${T}/environment.filtered" > "${T}/environment"
                retval=$?
        else
                retval=1