Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 01 Feb 2022 18:33:45
Message-Id: 1643740397.ad5b2e474a3fb84a34f394c6305dd823e15cad7c.mgorny@gentoo
1 commit: ad5b2e474a3fb84a34f394c6305dd823e15cad7c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 30 10:17:38 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 1 18:33:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5b2e47
7
8 distutils-r1.eclass: Disable stale egg-info cleaning in PEP517 mode
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/distutils-r1.eclass | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
16 index 8d03d2d1771d..4ec252958408 100644
17 --- a/eclass/distutils-r1.eclass
18 +++ b/eclass/distutils-r1.eclass
19 @@ -1428,6 +1428,10 @@ distutils-r1_src_compile() {
20 # Those files ended up being unversioned, and caused issues:
21 # https://bugs.gentoo.org/534058
22 _distutils-r1_clean_egg_info() {
23 + if [[ ${DISTUTILS_USE_PEP517} ]]; then
24 + die "${FUNCNAME} is not implemented in PEP517 mode"
25 + fi
26 +
27 rm -rf "${BUILD_DIR}"/lib/*.egg-info || die
28 }
29
30 @@ -1436,7 +1440,9 @@ distutils-r1_src_test() {
31
32 if declare -f python_test >/dev/null; then
33 _distutils-r1_run_foreach_impl python_test
34 - _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info
35 + if [[ ! ${DISTUTILS_USE_PEP517} ]]; then
36 + _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info
37 + fi
38 fi
39
40 if declare -f python_test_all >/dev/null; then