On Mon, Jul 11, 2022 at 09:16:10AM -0400, Mike Gilbert wrote:
> It's common for python_check_deps to call python_has_version, which
> calls ebegin itself.
> 
> Signed-off-by: Mike Gilbert <flop...@gentoo.org>
> ---
>  eclass/python-utils-r1.eclass | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
> index a18ca58475f..5c678c524ae 100644
> --- a/eclass/python-utils-r1.eclass
> +++ b/eclass/python-utils-r1.eclass
> @@ -1399,9 +1399,12 @@ _python_run_check_deps() {
>  
>       local PYTHON_USEDEP="python_targets_${impl}(-)"
>       local PYTHON_SINGLE_USEDEP="python_single_target_${impl}(-)"
> -     ebegin "  python_check_deps"
> -     python_check_deps
> -     eend ${?}
> +     einfo "  python_check_deps"
> +     if python_check_deps; then
> +             einfo "  python_check_deps succeeded"
> +     else
> +             einfo "  python_check_deps failed"
> +     fi
>  }

I was about to go about merging this as suggested, but this masks the
return value, and then things like this always succeed:

if _python_run_check_deps "${impl}"; then

>  
>  # @FUNCTION: python_has_version
> -- 
> 2.37.0
> 
> 

-- 
ionen

Attachment: signature.asc
Description: PGP signature

Reply via email to