From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:00:47 +0000 (-0000)
Subject: Call _ebuild_phase_funcs() from ebuild_main() since it needs to be called for
X-Git-Tag: v2.1.6.12~101
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9748f33494e25775938896846b2926f3b8682f4e;p=portage.git

Call _ebuild_phase_funcs() from ebuild_main() since it needs to be called for
every phase (for EAPI 2 default() phase function setup). (trunk r13301)

svn path=/main/branches/2.1.6/; revision=13472
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8d1c8a0e7..c086e6d31 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1861,11 +1861,6 @@ _source_ebuild() {
 	done
 	[[ -n $DEFINED_PHASES ]] || DEFINED_PHASES=-
 
-	if [[ -n $EBUILD_PHASE && $EBUILD_PHASE != depend ]] ; then
-		local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE")
-		[[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func"
-	fi
-
 	# This needs to be exported since prepstrip is a separate shell script.
 	[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED
 }
@@ -1933,6 +1928,11 @@ ebuild_main() {
 		fi
 	fi
 
+	if [[ $EBUILD_PHASE != depend ]] ; then
+		local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE")
+		[[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func"
+	fi
+
 	source_all_bashrcs
 
 	case ${EBUILD_SH_ARGS} in