distutils-r1.eclass: Replace python_export with getter
authorMichał Górny <mgorny@gentoo.org>
Fri, 20 Mar 2020 08:07:19 +0000 (09:07 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sun, 22 Mar 2020 05:36:56 +0000 (06:36 +0100)
Signed-off-by: Michał Górny <mgorny@gentoo.org>
eclass/distutils-r1.eclass

index 114ccc8041cc8134c8f7b50b44b417e4fdfba16f..fd6c0193d12e8d14bdaf3712f239f679f711b352 100644 (file)
@@ -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}/}"