summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-21 10:31:13 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-21 10:31:13 +0000
commit1003c5d35f721ca3da8278987707f7e4452af884 (patch)
tree88e199af8e002662423b90003afe883d2b997b10
parentfcdcb431f6ec06c48c8c3e34a7171e349850ac16 (diff)
downloadportage-1003c5d35f721ca3da8278987707f7e4452af884.tar.gz
portage-1003c5d35f721ca3da8278987707f7e4452af884.tar.bz2
portage-1003c5d35f721ca3da8278987707f7e4452af884.zip
* Make save_ebuild_env() filter some more variables.
* Make dyn_install() filter S when it's no longer needed. svn path=/main/trunk/; revision=8581
-rwxr-xr-xbin/ebuild.sh10
1 files changed, 8 insertions, 2 deletions
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 \