1 |
commit: 059c0fff13b571a82d43f26412c05487d6b19d81 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 18 22:00:48 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=059c0fff |
7 |
|
8 |
distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6 |
9 |
|
10 |
eclass/distutils-r1.eclass | 10 ++++++++-- |
11 |
1 file changed, 8 insertions(+), 2 deletions(-) |
12 |
|
13 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
14 |
index 551bc09..b249985 100644 |
15 |
--- a/eclass/distutils-r1.eclass |
16 |
+++ b/eclass/distutils-r1.eclass |
17 |
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() { |
18 |
fi |
19 |
|
20 |
if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then |
21 |
- eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all" |
22 |
+ local cmd=die |
23 |
+ [[ ${EAPI} == [45] ]] && cmd=eqawarn |
24 |
+ |
25 |
+ "${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all" |
26 |
fi |
27 |
|
28 |
if declare -f python_prepare >/dev/null; then |
29 |
@@ -802,7 +805,10 @@ distutils-r1_src_install() { |
30 |
fi |
31 |
|
32 |
if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then |
33 |
- eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all" |
34 |
+ local cmd=die |
35 |
+ [[ ${EAPI} == [45] ]] && cmd=eqawarn |
36 |
+ |
37 |
+ "${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all" |
38 |
fi |
39 |
} |