diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-21 10:32:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-21 10:32:04 +0000 |
| commit | c50a815c63f1c527fa0c38030e0de861f09a74f0 (patch) | |
| tree | ea1bc391e64efdcd4bb5452e00898cad68110de8 /bin/ebuild.sh | |
| parent | e1a3306d601b5ebcc5e50a5f2c190680a29ffb9e (diff) | |
| download | portage-c50a815c63f1c527fa0c38030e0de861f09a74f0.tar.gz portage-c50a815c63f1c527fa0c38030e0de861f09a74f0.tar.bz2 portage-c50a815c63f1c527fa0c38030e0de861f09a74f0.zip | |
* 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
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 10 |
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 \ |