Signed-off-by: Michał Górny <[email protected]>
---
eclass/python-any-r2.eclass | 2 +-
eclass/python-r2.eclass | 2 +-
eclass/python-utils-r2.eclass | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/eclass/python-any-r2.eclass b/eclass/python-any-r2.eclass
index 05e614ca4899..bedd4aa6cae1 100644
--- a/eclass/python-any-r2.eclass
+++ b/eclass/python-any-r2.eclass
@@ -259,7 +259,7 @@ _python_EPYTHON_supported() {
esac
if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then
- if python_is_installed "${i}"; then
+ if _python_is_installed "${i}"; then
if declare -f python_check_deps >/dev/null; then
local
PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)"
python_check_deps
diff --git a/eclass/python-r2.eclass b/eclass/python-r2.eclass
index feb8229eb2c5..4dac2513c12b 100644
--- a/eclass/python-r2.eclass
+++ b/eclass/python-r2.eclass
@@ -720,7 +720,7 @@ python_setup() {
# if python_check_deps() is declared, switch into any-of mode
if [[ ${has_check_deps} ]]; then
# first check if the interpreter is installed
- python_is_installed "${impl}" || continue
+ _python_is_installed "${impl}" || continue
# then run python_check_deps
local
PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)"
python_check_deps || continue
diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass
index f0d8f366c050..bbd1802e3e7a 100644
--- a/eclass/python-utils-r2.eclass
+++ b/eclass/python-utils-r2.eclass
@@ -1059,14 +1059,15 @@ python_is_python3() {
[[ ${impl} == python3* || ${impl} == pypy3 ]]
}
-# @FUNCTION: python_is_installed
+# @FUNCTION: _python_is_installed
# @USAGE: [<impl>]
+# @INTERNAL
# @DESCRIPTION:
# Check whether the interpreter for <impl> (or ${EPYTHON}) is installed.
# Uses has_version with a proper dependency string.
#
# Returns 0 (true) if it is, 1 (false) otherwise.
-python_is_installed() {
+_python_is_installed() {
local impl=${1:-${EPYTHON}}
[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON"
local hasv_args=()
--
2.25.1
