diff options
| author | Peter Maydell | 2021-05-14 18:20:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-05-14 18:20:08 +0200 |
| commit | 6d34aa9969ff85ca6eaeb4dc1988a4d4e13e7d79 (patch) | |
| tree | 1e4e422b5c81bbf74fab5859073ff3f5028ea6e1 /docs/meson.build | |
| parent | Merge remote-tracking branch 'remotes/cminyard/tags/for-qemu-6.1-v1' into sta... (diff) | |
| parent | sphinx: adopt kernel readthedoc theme (diff) | |
| download | qemu-6d34aa9969ff85ca6eaeb4dc1988a4d4e13e7d79.tar.gz qemu-6d34aa9969ff85ca6eaeb4dc1988a4d4e13e7d79.tar.xz qemu-6d34aa9969ff85ca6eaeb4dc1988a4d4e13e7d79.zip | |
Merge remote-tracking branch 'remotes/marcandre/tags/rtd-pull-request' into staging
Pull request
# gpg: Signature made Fri 14 May 2021 12:12:24 BST
# gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg: issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/marcandre/tags/rtd-pull-request:
sphinx: adopt kernel readthedoc theme
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/meson.build')
| -rw-r--r-- | docs/meson.build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/meson.build b/docs/meson.build index f84306ba7e..855e3916e9 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -27,10 +27,9 @@ if sphinx_build.found() build_docs = (sphinx_build_test_out.returncode() == 0) if not build_docs - warning('@0@ is either too old or uses too old a Python version' - .format(sphinx_build.full_path())) + warning('@0@: @1@'.format(sphinx_build.full_path(), sphinx_build_test_out.stderr())) if get_option('docs').enabled() - error('Install a Python 3 version of python-sphinx') + error('Install a Python 3 version of python-sphinx and the readthedoc theme') endif endif endif |