diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2021-04-16 00:01:50 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2021-04-16 00:01:50 +0200 |
| commit | e9dfeed2518671e94779a6103301cded67fae0e2 (patch) | |
| tree | 98d38dd391642a48bc96fd35dc0a227247c9a14a /scripts/sphinx-pre-install | |
| parent | scripts: kernel-doc: improve parsing for kernel-doc comments syntax (diff) | |
| download | linux-e9dfeed2518671e94779a6103301cded67fae0e2.tar.xz linux-e9dfeed2518671e94779a6103301cded67fae0e2.zip | |
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>
Diffstat (limited to 'scripts/sphinx-pre-install')
| -rwxr-xr-x | scripts/sphinx-pre-install | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |