summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2005-10-11 07:34:56 +0000
committerBrian Harring <ferringb@gentoo.org>2005-10-11 07:34:56 +0000
commitea14cf1e1538662c000a6bc4137725a9f4aa562e (patch)
tree94af5b29766241a1c9ddb73d2dfb235d805d0dd6
parentGlobal var profiledir was only being set correctly when portage was imported ... (diff)
downloadportage-multirepo-ea14cf1e1538662c000a6bc4137725a9f4aa562e.tar.gz
portage-multirepo-ea14cf1e1538662c000a6bc4137725a9f4aa562e.tar.bz2
portage-multirepo-ea14cf1e1538662c000a6bc4137725a9f4aa562e.zip
reset EBUILD_DEATH_HOOKS prior to sourcing, due to stable's re-sourcing of ebuild every run.v2.0.53_rc5
god stable env handling sucks. :/ svn path=/main/branches/2.0/; revision=2122
-rwxr-xr-xbin/ebuild.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 2a9b9d4b..6cf40149 100755
--- 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}"