[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     fa1f11b031a51ca512fb498b64c3ce32aee2a8e7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  8 10:04:17 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 08:47:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1f11b0

python-r1.eclass: Fix any-r1-style python_setup without USE flags

Fix python_setup() not to fail if no USE flags are set while any-r1 API
is being used.  Reported by Arfrever.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/python-r1.eclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 74e3fb38a1c..5e9dafe63d8 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-r1.eclass
@@ -771,15 +771,18 @@ python_foreach_impl() {
 python_setup() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       _python_validate_useflags
+       local has_check_deps
+       declare -f python_check_deps >/dev/null && has_check_deps=1
+
+       if [[ ! ${has_check_deps} ]]; then
+               _python_validate_useflags
+       fi
+
        local pycompat=( "${PYTHON_COMPAT[@]}" )
        if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then
                pycompat=( ${PYTHON_COMPAT_OVERRIDE} )
        fi
 
-       local has_check_deps
-       declare -f python_check_deps >/dev/null && has_check_deps=1
-
        # (reverse iteration -- newest impl first)
        local found
        _python_verify_patterns "${@}"