From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Mar 2009 20:37:56 +0000 (-0000)
Subject: Add more QA warnings for econf calls during unexpected phases. Thanks to
X-Git-Tag: v2.2_rc24~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14efc18eb873f6ec0002c41d7a772b26f132f1b3;p=portage.git

Add more QA warnings for econf calls during unexpected phases. Thanks to
Diego Elio Pettenò <flameeyes@g.o> for the suggestion.

svn path=/main/trunk/; revision=12808
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index e2a796765..09bc8f960 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -468,9 +468,18 @@ hasgq() { hasg "$@" >/dev/null ; }
 econf() {
 	local x
 
-	! hasq "$EAPI" 0 1 && [[ $EBUILD_PHASE = compile && \
-		$(type -t src_configure) = function ]] && \
-		eqawarn "econf called in src_compile instead of src_configure"
+	local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE")
+	if [[ -n $phase_func ]] ; then
+		if hasq "$EAPI" 0 1 ; then
+			[[ $phase_func != src_compile ]] && \
+				eqawarn "QA Notice: econf called in" \
+					"$phase_func instead of src_compile"
+		else
+			[[ $phase_func != src_configure ]] && \
+				eqawarn "QA Notice: econf called in" \
+					"$phase_func instead of src_configure"
+		fi
+	fi
 
 	: ${ECONF_SOURCE:=.}
 	if [ -x "${ECONF_SOURCE}/configure" ]; then