Re: [PATCH] scripts: sphinx-pre-install: remove unnecessary double check for $cur_version

[Jonathan Corbet]

Sebastian Muxel <sebastian@xxxxxxxxx> writes:

> $cur_version is currently being tested twice with the first test
> resulting in an unhelpful "$sphinx returned an error", not continuing to
> the more helpful "$sphinx didn't return its version".
>
> This patch removes the first test to return the more useful message.
>
> Fixes: a8b380c379ef ("scripts: sphinx-pre-install: only ask to activate valid venvs")
> Signed-off-by: Sebastian Muxel <sebastian@xxxxxxxxx>
> ---
>  scripts/sphinx-pre-install | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index c1121f098542..ad9945ccb0cf 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -300,8 +300,6 @@ sub check_sphinx()
>  	}
>  
>  	$cur_version = get_sphinx_version($sphinx);
> -	die ("$sphinx returned an error") if (!$cur_version);
> -
>  	die "$sphinx didn't return its version" if (!$cur_version);

Applied, thanks.

jon