scripts: sphinx-pre-install: remove unnecessary double check for $cur_version
authorSebastian Muxel <sebastian@muxel.dev>
Tue, 27 Aug 2024 13:32:24 +0000 (15:32 +0200)
committerJonathan Corbet <corbet@lwn.net>
Thu, 5 Sep 2024 20:32:36 +0000 (14:32 -0600)
$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@muxel.dev>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20240827133224.160776-1-sebastian@muxel.dev
scripts/sphinx-pre-install

index c1121f0..ad9945c 100755 (executable)
@@ -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) {