Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 29 Jun 2022 17:49:38
Message-Id: 1656524962.618dc64f2539b6f429b96663194912811b962644.sam@gentoo
1 commit: 618dc64f2539b6f429b96663194912811b962644
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 24 14:07:13 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 17:49:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618dc64f
7
8 distutils-r1.eclass: Print gpep517 invocations verbosely
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 eclass/distutils-r1.eclass | 26 ++++++++++++++++++--------
14 1 file changed, 18 insertions(+), 8 deletions(-)
15
16 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
17 index 86ab1337cee5..ba21e3c43d92 100644
18 --- a/eclass/distutils-r1.eclass
19 +++ b/eclass/distutils-r1.eclass
20 @@ -1258,9 +1258,15 @@ distutils_wheel_install() {
21 local wheel=${2}
22
23 einfo " Installing ${wheel##*/} to ${root}"
24 - gpep517 install-wheel --destdir="${root}" --interpreter="${PYTHON}" \
25 - --prefix="${EPREFIX}/usr" "${wheel}" ||
26 - die "Wheel install failed"
27 + local cmd=(
28 + gpep517 install-wheel
29 + --destdir="${root}"
30 + --interpreter="${PYTHON}"
31 + --prefix="${EPREFIX}/usr"
32 + "${wheel}"
33 + )
34 + printf '%s\n' "${cmd[*]}"
35 + "${cmd[@]}" || die "Wheel install failed"
36
37 # remove installed licenses
38 find "${root}$(python_get_sitedir)" -depth \
39 @@ -1342,12 +1348,16 @@ distutils_pep517_install() {
40 local config_args=()
41 [[ -n ${config_settings} ]] &&
42 config_args+=( --config-json "${config_settings}" )
43 + local cmd=(
44 + gpep517 build-wheel
45 + --backend "${build_backend}"
46 + --output-fd 3
47 + --wheel-dir "${WHEEL_BUILD_DIR}"
48 + "${config_args[@]}"
49 + )
50 + printf '%s\n' "${cmd[*]}"
51 local wheel=$(
52 - gpep517 build-wheel --backend "${build_backend}" \
53 - --output-fd 3 \
54 - --wheel-dir "${WHEEL_BUILD_DIR}" \
55 - "${config_args[@]}" 3>&1 >&2 ||
56 - die "Wheel build failed"
57 + "${cmd[@]}" 3>&1 >&2 || die "Wheel build failed"
58 )
59 [[ -n ${wheel} ]] || die "No wheel name returned"