commit: 1718e9ce001799f97401a58877dced6ac232eb38 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Mar 20 08:07:19 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Mar 22 05:36:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1718e9ce
distutils-r1.eclass: Replace python_export with getter Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> eclass/distutils-r1.eclass | 8 +++----- 1 file 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}/}"