Prevent the filter_opts local variable from leaking into the

environment in preprocess_ebuild_env(). (trunk r8857)

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 5fcf27794c37c97ff7f22e64b63738b136d73b40..c40403264c46308f0f164440193a642e421a8945 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1442,7 +1442,8 @@ preprocess_ebuild_env() {
                filter_opts="--filter-sandbox ${filter_opts}"
        fi
        filter_readonly_variables ${filter_opts} < "${T}"/environment \
-               > "${T}"/environment.filtered
+               > "${T}"/environment.filtered || return $?
+       unset filter_opts
        mv "${T}"/environment.filtered "${T}"/environment || return $?
        rm -f "${T}/environment.success" || return $?
        # WARNING: Code inside this subshell should avoid making assumptions