From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 25 Nov 2007 21:34:44 +0000 (-0000)
Subject: Remove some unsafe assumptions from preprocess_ebuild_env() and
X-Git-Tag: v2.2_pre1~321
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c8273fedd2484bf9dde5136274144125a063507d;p=portage.git

Remove some unsafe assumptions from preprocess_ebuild_env() and
note the remaining assumption that save_ebuild_env() is not
overridden by the environment being loaded.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6e01ae8d9..60205d693 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1397,12 +1397,14 @@ preprocess_ebuild_env() {
 	filter_readonly_variables --filter-sandbox < "${T}"/environment \
 		> "${T}"/environment.filtered
 	mv "${T}"/environment.filtered "${T}"/environment
+	# TODO: Remove the assumption that the environment being loaded
+	# does not override the save_ebuild_env() function.
 	(
 		source "${T}"/environment
 		# Rely on save_ebuild_env() to filter out any remaining variables
 		# and functions that could interfere with the current environment.
-		save_ebuild_env | filter_readonly_variables > "${T}"/environment
-	)
+		save_ebuild_env
+	) | filter_readonly_variables > "${T}"/environment
 }
 
 # @FUNCTION: save_ebuild_env