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

[Michał Górny]

commit:     9e00927e4e20b7fa70428bef2e491142816e48ef
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 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=9e00927e

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

 eclass/python-utils-r1.eclass | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 236df89..d8bcb13 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1142,12 +1143,17 @@ python_fix_shebang() {
                done < <(find -H "${path}" -type f -print0 || die)
 
                if [[ ! ${any_fixed} ]]; then
-                       eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not 
match any fixable files."
+                       local cmd=eerror
+                       [[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+                       "${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not 
match any fixable files."
                        if [[ ${any_correct} ]]; then
-                               eqawarn "All files have ${EPYTHON} shebang 
already."
+                               "${cmd}" "All files have ${EPYTHON} shebang 
already."
                        else
-                               eqawarn "There are no Python files in specified 
directory."
+                               "${cmd}" "There are no Python files in 
specified directory."
                        fi
+
+                       [[ ${cmd} == eerror ]] && die "${FUNCNAME} did not 
match any fixable files (QA warning fatal in EAPI ${EAPI})"
                fi
        done
 }