Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 1/3] distutils-r1.eclass: Replace python_export with getter
Date: Fri, 20 Mar 2020 08:22:36
Message-Id: 20200320082202.86763-1-mgorny@gentoo.org
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/distutils-r1.eclass | 8 +++-----
4 1 file changed, 3 insertions(+), 5 deletions(-)
5
6 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
7 index 114ccc8041cc..fd6c0193d12e 100644
8 --- a/eclass/distutils-r1.eclass
9 +++ b/eclass/distutils-r1.eclass
10 @@ -771,13 +771,11 @@ _distutils-r1_wrap_scripts() {
11 local path=${1}
12 local bindir=${2}
13
14 - local PYTHON_SCRIPTDIR
15 - python_export PYTHON_SCRIPTDIR
16 -
17 + local scriptdir=$(python_get_scriptdir)
18 local f python_files=() non_python_files=()
19
20 - if [[ -d ${path}${PYTHON_SCRIPTDIR} ]]; then
21 - for f in "${path}${PYTHON_SCRIPTDIR}"/*; do
22 + if [[ -d ${path}${scriptdir} ]]; then
23 + for f in "${path}${scriptdir}"/*; do
24 [[ -d ${f} ]] && die "Unexpected directory: ${f}"
25 debug-print "${FUNCNAME}: found executable at ${f#${path}/}"
26
27 --
28 2.25.2

Replies