From: Jonathan Corbet <corbet@lwn.net>
Date: Mon, 22 Jun 2020 22:31:21 +0000 (-0600)
Subject: docs: Don't push Sphinx upgrades quite so readily
X-Git-Tag: v5.9-rc1~150^2~140^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f444efdaaed82f69d0afc4a7038a8563d8a3fa1;p=thirdparty%2Fkernel%2Flinux.git

docs: Don't push Sphinx upgrades quite so readily

The sphinx-pre-install script will put out a verbose message recommending
an upgrade for anybody running less than 2.4.4 - which was only released in
March.  So *everybody* will see that warning at this point.  Let's only
warn if the user is below our generally recommended version (1.7.9
currently).

It might be good to put out a warning if people are explicitly making PDF
files, but would need to be done in a different place and relatively few
people do that.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index c680c3efb176e..40fa6923e80ae 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -323,10 +323,6 @@ sub check_sphinx()
 		$rec_sphinx_upgrade = 1;
 		return;
 	}
-	if ($cur_version lt $min_pdf_version) {
-		$rec_sphinx_upgrade = 1;
-		return;
-	}
 
 	# On version check mode, just assume Sphinx has all mandatory deps
 	exit (0) if ($version_check);