From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 24 Nov 2019 14:31:41 +0000 (+0100)
Subject: python-utils-r1.eclass: Fix early return in _python_impl_matches
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6f149afdec7db691ab9f3d6c5fa0e4467295ebfa;p=gentoo.git

python-utils-r1.eclass: Fix early return in _python_impl_matches

Fix _python_impl_matches() not to return early on unsuccessful -2/-3
match.  This caused constructs such as '$(python_gen_cond_dep ... -2
python3_{5,6,7})' to ignore arguments following '-2'.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 647eb04344d2..44337c687aad 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -183,10 +183,9 @@ _python_impl_matches() {
 
 	for pattern; do
 		if [[ ${pattern} == -2 ]]; then
-			! python_is_python3 "${impl}"
-			return
+			python_is_python3 "${impl}" || return 0
 		elif [[ ${pattern} == -3 ]]; then
-			python_is_python3 "${impl}"
+			python_is_python3 "${impl}" && return 0
 			return
 		# unify value style to allow lax matching
 		elif [[ ${impl/./_} == ${pattern/./_} ]]; then