From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: python@gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 09/25] python-utils-r2.eclass: Mark python_is_installed private
Date: Sat, 29 Feb 2020 21:41:45 +0100 [thread overview]
Message-ID: <20200229204201.99290-10-mgorny@gentoo.org> (raw)
In-Reply-To: <20200229204201.99290-1-mgorny@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
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
next prev parent reply other threads:[~2020-02-29 20:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 20:41 [gentoo-dev] [PATCH 00/25] python-r2 eclass suite Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 01/25] eclass: Copy python-r1 suite to python-r2 Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 02/25] distutils-r2.eclass: Remove EXAMPLES Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 03/25] distutils-r2.eclass: Remove no-op subphase defaults Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 04/25] distutils-r2.eclass: Remove distutils.eclass checks Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 05/25] distutils-r2.eclass: Make all old QA warnings fatal Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 06/25] python-r2.eclass: Remove python_gen_usedep Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 07/25] python-utils-r2.eclass: Remove python.eclass checks Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 08/25] python-utils-r2.eclass: Mark python_wrapper_setup private Michał Górny
2020-02-29 20:41 ` Michał Górny [this message]
2020-02-29 20:41 ` [gentoo-dev] [PATCH 10/25] python-utils-r2.eclass: Add missing @INTERNAL to private func Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 11/25] python-utils-r2.eclass: Fix obsolete docs on python_export_best Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 12/25] python-utils-r2.eclass: Mark python_export private Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 13/25] python-utils-r2.eclass: Remove PYTHON_SITEDIR export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 14/25] python-utils-r2.eclass: Remove PYTHON_INCLUDEDIR export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 15/25] python-utils-r2.eclass: Remove PYTHON_LIBPATH export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 16/25] python-utils-r2.eclass: Remove PYTHON_CFLAGS export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 17/25] python-utils-r2.eclass: Remove PYTHON_LIBS export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 18/25] python-utils-r2.eclass: Remove PYTHON_CONFIG export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 19/25] python-utils-r2.eclass: Remove PYTHON_SCRIPTDIR export Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 20/25] python-single-r2.eclass: PYTHON_MULTI_USEDEP → PYTHON_USEDEP Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 21/25] distutils-r2.eclass: Pass --skip-build to install Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 22/25] eclass: python-r2.eclass → python-multi-r2.eclass Michał Górny
2020-02-29 20:41 ` [gentoo-dev] [PATCH 23/25] python-any-r2.eclass: Verbosely report used implementation Michał Górny
2020-02-29 20:42 ` [gentoo-dev] [PATCH 24/25] python-single-r2.eclass: Report used impl verbosely Michał Górny
2020-02-29 20:42 ` [gentoo-dev] [PATCH 25/25] python-multi-r2.eclass: Report python_setup " Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200229204201.99290-10-mgorny@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
--cc=python@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox