OSDN Git Service

docs: sphinx-pre-install: don't barf on beta Sphinx releases
authorJonathan Corbet <corbet@lwn.net>
Thu, 15 Apr 2021 22:01:50 +0000 (16:01 -0600)
committerJonathan Corbet <corbet@lwn.net>
Thu, 15 Apr 2021 22:01:50 +0000 (16:01 -0600)
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>
scripts/sphinx-pre-install

index b5f9fd5..fe92020 100755 (executable)
@@ -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;
                }