From a82fc235ece39a45fa8c8db1419307225aa7b61f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 07:39:58 +0000 Subject: [PATCH] =?utf8?q?Add=20more=20QA=20warnings=20for=20econf=20calls?= =?utf8?q?=20during=20unexpected=20phases.=20Thanks=20to=20Diego=20Elio=20?= =?utf8?q?Petten=C3=B2=20=20for=20the=20suggestion.=20(trun?= =?utf8?q?k=20r12808)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/main/branches/2.1.6/; revision=13040 --- bin/ebuild.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 -- 2.26.2