Skip to content

Commit

Permalink
docs: sphinx-pre-install: don't barf on beta Sphinx releases
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Jonathan Corbet committed Apr 15, 2021
1 parent f9bbc12 commit e9dfeed
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/sphinx-pre-install
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit e9dfeed

Please sign in to comment.