From 0e28cca82a81fb97597096cf2e30a49eb9af5043 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 22 Jun 2020 15:00:02 +0100 Subject: [PATCH] doc: fix build when sphinx reports version to stderr When sphinx-build reports its version information to stderr rather than stdout, the wrapper script misses it, and then fails to run. We can fix this by redirecting stderr to stdout for the version query call. Fixes: f5ab2074cfba ("doc: rebuild with meson whenever a file changes") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Tested-by: Ciara Power Tested-by: David Marchand --- buildtools/call-sphinx-build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index b9a3994e17..85c9e01563 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -6,13 +6,14 @@ import sys import os from os.path import join -from subprocess import run, PIPE +from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion (sphinx, src, dst) = sys.argv[1:] # assign parameters to variables # for sphinx version >= 1.7 add parallelism using "-j auto" -ver = run([sphinx, '--version'], stdout=PIPE).stdout.decode().split()[-1] +ver = run([sphinx, '--version'], stdout=PIPE, + stderr=STDOUT).stdout.decode().split()[-1] sphinx_cmd = [sphinx] if StrictVersion(ver) >= StrictVersion('1.7'): sphinx_cmd += ['-j', 'auto'] -- 2.20.1