From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Nov 2007 10:32:04 +0000 (-0000)
Subject: * Make save_ebuild_env() filter some more variables.
X-Git-Tag: v2.1.4~248
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c50a815c63f1c527fa0c38030e0de861f09a74f0;p=portage.git

* Make save_ebuild_env() filter some more variables.
* Make dyn_install() filter S when it's no longer needed.
(trunk r8581)

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ee06c2f09..bed192034 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1020,6 +1020,11 @@ 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
 	bzip2 -f9 environment
 
@@ -1448,8 +1453,9 @@ save_ebuild_env() {
 			KV LAST_E_CMD LAST_E_LEN LD_PRELOAD MOPREFIX \
 			NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
 			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
-			PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BUILDDIR PORTAGE_CALLER \
-			PORTAGE_COLORMAP PORTAGE_CONFIGROOT \
+			PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BINPKG_TMPFILE \
+			PORTAGE_BUILDDIR PORTAGE_CALLER \
+			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
 			PORTAGE_DEPCACHEDIR PORTAGE_ELOG_CLASSES PORTAGE_ELOG_MAILFROM \
 			PORTAGE_ELOG_MAILSUBJECT PORTAGE_ELOG_MAILURI PORTAGE_ELOG_SYSTEM \
 			PORTAGE_GID PORTAGE_GPG_DIR PORTAGE_GPG_KEY PORTAGE_INST_GID \