Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 1/6] distutils-r1.eclass: Disable stale egg-info cleaning in PEP517 mode
Date: Mon, 31 Jan 2022 22:59:48
Message-Id: 20220131225920.192125-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/6] Another batch of distutils-r1.eclass fixes by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/distutils-r1.eclass | 8 +++++++-
4 1 file changed, 7 insertions(+), 1 deletion(-)
5
6 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
7 index 8d03d2d1771d..4ec252958408 100644
8 --- a/eclass/distutils-r1.eclass
9 +++ b/eclass/distutils-r1.eclass
10 @@ -1428,6 +1428,10 @@ distutils-r1_src_compile() {
11 # Those files ended up being unversioned, and caused issues:
12 # https://bugs.gentoo.org/534058
13 _distutils-r1_clean_egg_info() {
14 + if [[ ${DISTUTILS_USE_PEP517} ]]; then
15 + die "${FUNCNAME} is not implemented in PEP517 mode"
16 + fi
17 +
18 rm -rf "${BUILD_DIR}"/lib/*.egg-info || die
19 }
20
21 @@ -1436,7 +1440,9 @@ distutils-r1_src_test() {
22
23 if declare -f python_test >/dev/null; then
24 _distutils-r1_run_foreach_impl python_test
25 - _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info
26 + if [[ ! ${DISTUTILS_USE_PEP517} ]]; then
27 + _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info
28 + fi
29 fi
30
31 if declare -f python_test_all >/dev/null; then
32 --
33 2.35.1