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

[Michał Górny]

commit:     e9cbcae19c68bdd11dadb4391babeda92aa2e8a0
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: Sat Nov 28 19:09:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9cbcae1

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