[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     059c0fff13b571a82d43f26412c05487d6b19d81
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 19:09:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059c0fff

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 551bc09..b249985 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() {
        fi
 
        if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-               eqawarn "QA warning: python_prepare_all() didn't call 
distutils-r1_python_prepare_all"
+               local cmd=die
+               [[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+               "${cmd}" "QA: python_prepare_all() didn't call 
distutils-r1_python_prepare_all"
        fi
 
        if declare -f python_prepare >/dev/null; then
@@ -802,7 +805,10 @@ distutils-r1_src_install() {
        fi
 
        if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-               eqawarn "QA warning: python_install_all() didn't call 
distutils-r1_python_install_all"
+               local cmd=die
+               [[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+               "${cmd}" "QA: python_install_all() didn't call 
distutils-r1_python_install_all"
        fi
 }