summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSebastian Muxel <sebastian@muxel.dev>2024-08-27 16:32:24 +0300
committerJonathan Corbet <corbet@lwn.net>2024-09-05 23:32:36 +0300
commit9b8a79f4c1d844d52273a31bc6511fa8ab5e8669 (patch)
tree39d510884f100b8096538463ad4aede4208ec1b4 /scripts
parentbc6cb62007fd6e321385d2df6fae3c38b53c0a82 (diff)
downloadlinux-9b8a79f4c1d844d52273a31bc6511fa8ab5e8669.tar.xz
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 <sebastian@muxel.dev> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/20240827133224.160776-1-sebastian@muxel.dev
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/sphinx-pre-install2
1 files changed, 0 insertions, 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);
if ($cur_version lt $min_version) {