Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:python-eapi6 commit in: eclass/
Date: Wed, 25 Nov 2015 13:46:05
Message-Id: 1448459037.0519beb71a1b287ddf9a17d618ce238c0c1a55b4.mgorny@gentoo
1 commit: 0519beb71a1b287ddf9a17d618ce238c0c1a55b4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 18 21:50:57 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 25 13:43:57 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0519beb7
7
8 distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6
9
10 eclass/distutils-r1.eclass | 4 +++-
11 1 file changed, 3 insertions(+), 1 deletion(-)
12
13 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
14 index 47b09b0..e632202 100644
15 --- a/eclass/distutils-r1.eclass
16 +++ b/eclass/distutils-r1.eclass
17 @@ -563,7 +563,9 @@ distutils-r1_python_install() {
18 fi
19 done
20 if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
21 - eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
22 + local cmd=die
23 + [[ ${EAPI} == [45] ]] && cmd=eqawarn
24 + "${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
25 fi
26
27 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then