diff options
| author | Stephen Kitt <steve@sk2.org> | 2020-01-24 19:33:16 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2020-02-05 10:33:44 -0700 |
| commit | d1c9038ab5c1c96c0fd9d13ec56f2d650fe4c59f (patch) | |
| tree | 249e787e6715ad08c0073dbfbbf5d9745370b004 /scripts | |
| parent | 599e6f8d3d23ec79d31891cda11af6e79d591ead (diff) | |
| download | linux-stable-d1c9038ab5c1c96c0fd9d13ec56f2d650fe4c59f.tar.gz linux-stable-d1c9038ab5c1c96c0fd9d13ec56f2d650fe4c59f.tar.bz2 linux-stable-d1c9038ab5c1c96c0fd9d13ec56f2d650fe4c59f.zip | |
Allow git builds of Sphinx
When using a non-release version of Sphinx, from a local build (with
improvements for kernel doc handling, why not),
sphinx-build --version
reports versions of the form
sphinx-build 3.0.0+/4703d9119972
i.e. base version, a plus symbol, slash, and the start of the git hash
of whatever repository the command is run in (no, not the hash that
was used to build Sphinx!).
This patch fixes the installation check in sphinx-pre-install to
recognise such version output.
Signed-off-by: Stephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20200124183316.1719218-1-steve@sk2.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts')
| -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 470ccfe678aa..a8f0c002a340 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -272,7 +272,7 @@ sub check_sphinx() open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error"; while (<IN>) { - if (m/^\s*sphinx-build\s+([\d\.]+)$/) { + if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) { $cur_version=$1; last; } |