From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 15 Apr 2021 22:01:50 +0000 (-0600)
Subject: docs: sphinx-pre-install: don't barf on beta Sphinx releases
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9dfeed2518671e94779a6103301cded67fae0e2;p=uclinux-h8%2Flinux.git

docs: sphinx-pre-install: don't barf on beta Sphinx releases

sphinx-pre-install is picky when it comes to parsing sphinx versions; it
failed when run with sphinx 4.0.0b1.  Tweak the regex to tolerate a
trailing "bN" on the version number.

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

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index b5f9fd5b2880..fe92020d67e3 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -259,7 +259,7 @@ sub get_sphinx_version($)
 
 	open IN, "$cmd --version 2>&1 |";
 	while (<IN>) {
-		if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) {
+		if (m/^\s*sphinx-build\s+([\d\.]+)((\+\/[\da-f]+)|(b\d+))?$/) {
 			$ver=$1;
 			last;
 		}