From 6f149afdec7db691ab9f3d6c5fa0e4467295ebfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 24 Nov 2019 15:31:41 +0100 Subject: [PATCH] python-utils-r1.eclass: Fix early return in _python_impl_matches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- eclass/python-utils-r1.eclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 647eb04344d29..44337c687aada 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