From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Nov 2007 10:45:53 +0000 (-0000)
Subject: In dyn_install(), don't cleanse S from the global environment,
X-Git-Tag: v2.1.4~247
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=096443b81050a33f840b381f37617709c0813ba6;p=portage.git

In dyn_install(), don't cleanse S from the global environment,
in case the user wants to repeat the phase (like with
FEATURES=noauto and the ebuild command). Only cleanse it from
environment.bz2. (trunk r8583)

svn path=/main/branches/2.1.2/; revision=8584
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bed192034..40f34a65f 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1021,11 +1021,15 @@ dyn_install() {
 	# local variables can leak into the saved environment.
 	unset f
 
-	# To avoid environment bloat, cleanse variables that are
-	# are no longer needed after src_install().
-	unset S
-
-	save_ebuild_env > environment
+	(
+		# To avoid environment.bz2 bloat, cleanse variables that are
+		# are no longer needed after src_install(). Don't cleanse from
+		# the global environment though, in case the user wants to repeat
+		# this phase (like with FEATURES=noauto and the ebuild command).
+		unset S
+	
+		save_ebuild_env > environment
+	)
 	bzip2 -f9 environment
 
 	cp "${EBUILD}" "${PF}.ebuild"