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: Fri, 08 Apr 2022 18:06:11
Message-Id: 1649441139.3adbe305677653d372da5973ac19b6b547f27312.mgorny@gentoo
1 commit: 3adbe305677653d372da5973ac19b6b547f27312
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 8 15:10:05 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 8 18:05:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adbe305
7
8 distutils-r1.eclass: Fix PEP517 + single-impl w/ no scripts
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/distutils-r1.eclass | 5 ++++-
13 1 file changed, 4 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
16 index 1724804687a1..02d8bf547cba 100644
17 --- a/eclass/distutils-r1.eclass
18 +++ b/eclass/distutils-r1.eclass
19 @@ -1274,7 +1274,10 @@ distutils-r1_python_install() {
20 # are already in scriptdir
21 rm -r "${root}${scriptdir}" || die
22 if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then
23 - mv "${root}$(python_get_scriptdir)" "${root}${scriptdir}" || die
24 + local wrapped_scriptdir=${root}$(python_get_scriptdir)
25 + if [[ -d ${wrapped_scriptdir} ]]; then
26 + mv "${wrapped_scriptdir}" "${root}${scriptdir}" || die
27 + fi
28 fi
29 else
30 local root=${D%/}/_${EPYTHON}