From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 18 Nov 2015 21:41:51 +0000 (+0100)
Subject: distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e9cbcae19c68bdd11dadb4391babeda92aa2e8a0;p=gentoo.git

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

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