From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-848025-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 517591384B4
for <garchives@archives.gentoo.org>; Sun, 22 Nov 2015 09:01:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 35C6E21C02F;
Sun, 22 Nov 2015 09:01:27 +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 127A821C032
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2015 09:01:25 +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 139513408A6
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2015 09:01:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 77E8A10FF
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2015 09:01:20 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1448182812.42d0374b2fdd6651dee478e1b8efcd8285593299.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: 42d0374b2fdd6651dee478e1b8efcd8285593299
X-VCS-Branch: python-eapi6
Date: Sun, 22 Nov 2015 09:01:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8112d8aa-7f1c-4d72-986e-3fc415a745fa
X-Archives-Hash: b9cca2e1b8ab8e752cc4cf4d04baa441
commit: 42d0374b2fdd6651dee478e1b8efcd8285593299
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d0374b
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