From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 19 Nov 2007 22:08:07 +0000 (-0000)
Subject: Make preprocess_ebuild_env() explicitly filter out FEATURES
X-Git-Tag: v2.2_pre1~374
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57410421b77410c626836c1b3e161bc0a9d335c2;p=portage.git

Make preprocess_ebuild_env() explicitly filter out FEATURES
since the value for that variable should never come from a
previously saved environment.

svn path=/main/trunk/; revision=8532
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 228602df4..653aacb22 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1392,6 +1392,7 @@ preprocess_ebuild_env() {
 	save_ebuild_env > "${T}"/environment.baseline
 	(
 		source "${T}"/environment
+		unset FEATURES
 		source "${T}"/environment.baseline
 		save_ebuild_env > "${T}"/environment
 	)