From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 18 Nov 2015 22:00:48 +0000 (+0100)
Subject: distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=059c0fff13b571a82d43f26412c05487d6b19d81;p=gentoo.git

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6
---

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 551bc094e321..b249985a2a1c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -802,7 +805,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }