From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 6 Dec 2007 23:29:03 +0000 (-0000)
Subject: Prevent the filter_opts local variable from leaking into the
X-Git-Tag: v2.1.4~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1fd20e5bd5138196e2c58eb1c0b6895bf1bf6af;p=portage.git

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 5fcf27794..c40403264 100755
--- 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