From dc1ca65141e30ca2f9e60266de1ae7387e767bef Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 21 Nov 2007 10:45:22 +0000 Subject: 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. svn path=/main/trunk/; revision=8583 --- bin/ebuild.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'bin/ebuild.sh') 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" -- cgit v1.2.3-1-g7c22