summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-11-18 22:41:51 +0100
committerMichał Górny <mgorny@gentoo.org>2015-11-28 20:09:06 +0100
commite9cbcae19c68bdd11dadb4391babeda92aa2e8a0 (patch)
tree5dac85d893d5ce85a43e4c3012410bf6818fc326
parentpython-r1.eclass: Enable EAPI 6 (diff)
downloadgentoo-e9cbcae19c68bdd11dadb4391babeda92aa2e8a0.tar.gz
gentoo-e9cbcae19c68bdd11dadb4391babeda92aa2e8a0.tar.bz2
gentoo-e9cbcae19c68bdd11dadb4391babeda92aa2e8a0.zip
distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6
-rw-r--r--eclass/distutils-r1.eclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4fb80e4..256c893f3b17 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