distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4fb80e4cce577d0ca6673fdf2b171c55d13..256c893f3b170c29479c086a57272572ca9ba534 100644 (file)
--- 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