summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-03-20 09:07:19 +0100
committerMichał Górny <mgorny@gentoo.org>2020-03-22 06:36:56 +0100
commit1718e9ce001799f97401a58877dced6ac232eb38 (patch)
tree6d8ea40621981ef396a35555ee07e881cb4f918c
parentpython-utils-r1.eclass: Make python_wrapper_setup private (diff)
downloadgentoo-1718e9ce001799f97401a58877dced6ac232eb38.tar.gz
gentoo-1718e9ce001799f97401a58877dced6ac232eb38.tar.bz2
gentoo-1718e9ce001799f97401a58877dced6ac232eb38.zip
distutils-r1.eclass: Replace python_export with getter
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--eclass/distutils-r1.eclass8
1 files changed, 3 insertions, 5 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 114ccc8041c..fd6c0193d12 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -771,13 +771,11 @@ _distutils-r1_wrap_scripts() {
local path=${1}
local bindir=${2}
- local PYTHON_SCRIPTDIR
- python_export PYTHON_SCRIPTDIR
-
+ local scriptdir=$(python_get_scriptdir)
local f python_files=() non_python_files=()
- if [[ -d ${path}${PYTHON_SCRIPTDIR} ]]; then
- for f in "${path}${PYTHON_SCRIPTDIR}"/*; do
+ if [[ -d ${path}${scriptdir} ]]; then
+ for f in "${path}${scriptdir}"/*; do
[[ -d ${f} ]] && die "Unexpected directory: ${f}"
debug-print "${FUNCNAME}: found executable at ${f#${path}/}"