Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 21/29] distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6
Date: Sun, 22 Nov 2015 20:04:32
Message-Id: 1448221870-17269-22-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCHES] Clean-up & EAPI 6 support for python-r1 suite by "Michał Górny"
1 ---
2 eclass/distutils-r1.eclass | 5 ++++-
3 1 file changed, 4 insertions(+), 1 deletion(-)
4
5 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
6 index 185dd4f..256c893 100644
7 --- a/eclass/distutils-r1.eclass
8 +++ b/eclass/distutils-r1.eclass
9 @@ -236,10 +236,13 @@ fi
10 esetup.py() {
11 debug-print-function ${FUNCNAME} "${@}"
12
13 + local die_args=()
14 + [[ ${EAPI} != [45] ]] && die_args+=( -n )
15 +
16 set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
17
18 echo "${@}" >&2
19 - "${@}" || die
20 + "${@}" || die "${die_args[@]}" || return ${?}
21 }
22
23 # @FUNCTION: distutils_install_for_testing
24 --
25 2.6.3