From: Sebastian Muxel Date: Tue, 27 Aug 2024 13:32:24 +0000 (+0200) Subject: scripts: sphinx-pre-install: remove unnecessary double check for $cur_version X-Git-Tag: v6.12-rc1~173^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b8a79f4c1d844d52273a31bc6511fa8ab5e8669;p=thirdparty%2Fkernel%2Flinux.git scripts: sphinx-pre-install: remove unnecessary double check for $cur_version $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 Signed-off-by: Jonathan Corbet Link: https://lore.kernel.org/r/20240827133224.160776-1-sebastian@muxel.dev --- diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index c1121f0985424..ad9945ccb0cf2 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); if ($cur_version lt $min_version) {