scripts: sphinx-pre-install: check for PDF min version later on

Better to add the PDF note late for venv recommendation.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Link: https://lore.kernel.org/r/8e117aabe6dfa1b1ec92dccd20e801393c977667.1656756450.git.mchehab@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index cfb82c548fb3c5c13dbd4f6116475b2566421159..2ef2c561fdc6159c21b39cda1e94af40159e01df 100755 (executable)
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -785,12 +785,13 @@ sub recommend_sphinx_version($)
 {
        my $virtualenv_cmd = shift;
 
-       if ($latest_avail_ver lt $min_pdf_version) {
-               print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n";
-       }
-
        # Version is OK. Nothing to do.
-       return if ($cur_version && ($cur_version ge $rec_version));
+       if ($cur_version && ($cur_version ge $rec_version)) {
+               if ($cur_version lt $min_pdf_version) {
+                       print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n";
+               }
+               return;
+       };
 
        if (!$need_sphinx) {
                # sphinx-build is present and its version is >= $min_version
@@ -837,6 +838,10 @@ sub recommend_sphinx_version($)
                        printf "\t. $activate_cmd\n";
                        deactivate_help();
 
+                       if ($latest_avail_ver lt $min_pdf_version) {
+                               print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n";
+                       }
+
                        return;
                }