From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3CCE11388C1 for ; Sat, 28 Nov 2015 19:09:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70922E08C0; Sat, 28 Nov 2015 19:09:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7506CE085D for ; Sat, 28 Nov 2015 19:09:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B4C8340906 for ; Sat, 28 Nov 2015 19:09:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48715A95 for ; Sat, 28 Nov 2015 19:09:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1448737746.9e00927e4e20b7fa70428bef2e491142816e48ef.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9e00927e4e20b7fa70428bef2e491142816e48ef X-VCS-Branch: master Date: Sat, 28 Nov 2015 19:09:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 48296c81-56a6-4f65-a6c9-dff414012fa9 X-Archives-Hash: d14520c2bd1b2c145315616120b6d9e3 commit: 9e00927e4e20b7fa70428bef2e491142816e48ef Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 19:30:10 2015 +0000 Commit: Michał Górny gentoo 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 }