| 1 |
commit: e9cbcae19c68bdd11dadb4391babeda92aa2e8a0 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 18 21:41:51 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 19:09:06 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9cbcae1 |
| 7 |
|
| 8 |
distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6 |
| 9 |
|
| 10 |
eclass/distutils-r1.eclass | 5 ++++- |
| 11 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 14 |
index 185dd4f..256c893 100644 |
| 15 |
--- a/eclass/distutils-r1.eclass |
| 16 |
+++ b/eclass/distutils-r1.eclass |
| 17 |
@@ -236,10 +236,13 @@ fi |
| 18 |
esetup.py() { |
| 19 |
debug-print-function ${FUNCNAME} "${@}" |
| 20 |
|
| 21 |
+ local die_args=() |
| 22 |
+ [[ ${EAPI} != [45] ]] && die_args+=( -n ) |
| 23 |
+ |
| 24 |
set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}" |
| 25 |
|
| 26 |
echo "${@}" >&2 |
| 27 |
- "${@}" || die |
| 28 |
+ "${@}" || die "${die_args[@]}" || return ${?} |
| 29 |
} |
| 30 |
|
| 31 |
# @FUNCTION: distutils_install_for_testing |
Archives