reset EBUILD_DEATH_HOOKS prior to sourcing, due to stable's re-sourcing of ebuild...

god stable env handling sucks. :/

svn path=/main/branches/2.0/; revision=2122

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 2a9b9d4b0dafda946b2e471460ab1ce6adc2d76b..6cf4014937886aba5fb2533e320fedfe9b24f88f 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1769,6 +1769,11 @@ if hasq "depend" "$@"; then
        done
        unset src bin_path body
 fi
+
+# reset the EBUILD_DEATH_HOOKS so they don't multiple due to stable's re-sourcing of env.
+# this can be left out of ebd variants, since they're unaffected.
+unset EBUILD_DEATH_HOOKS
+
 source ${EBUILD} || die "error sourcing ebuild"
 if ! hasq depend $EBUILD_PHASE; then
        RESTRICT="${PORTAGE_RESTRICT}"