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 A3DEF1384B4 for ; Thu, 19 Nov 2015 07:28:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F364D21C027; Thu, 19 Nov 2015 07:28:04 +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 CCBEB21C026 for ; Thu, 19 Nov 2015 07:28:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2055B340775 for ; Thu, 19 Nov 2015 07:28:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBD411466 for ; Thu, 19 Nov 2015 07:27:58 +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: <1447918021.e1ee7ff20f440e967aace403f8a8ed5456bcf657.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:python-eapi6 commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/distutils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e1ee7ff20f440e967aace403f8a8ed5456bcf657 X-VCS-Branch: python-eapi6 Date: Thu, 19 Nov 2015 07:27:58 +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: b0eb4aec-0b4d-48dc-a1eb-0ce250cae1ce X-Archives-Hash: ea24c473a3f88f99245215fe0c4f9e56 commit: e1ee7ff20f440e967aace403f8a8ed5456bcf657 Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 21:41:51 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 19 07:27:01 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ee7ff2 distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6 eclass/distutils-r1.eclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 185dd4f..256c893 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -236,10 +236,13 @@ fi esetup.py() { debug-print-function ${FUNCNAME} "${@}" + local die_args=() + [[ ${EAPI} != [45] ]] && die_args+=( -n ) + set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}" echo "${@}" >&2 - "${@}" || die + "${@}" || die "${die_args[@]}" || return ${?} } # @FUNCTION: distutils_install_for_testing