d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

doc: fix build when sphinx reports version to stderr

Browse Source 
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: f5ab2074cf ("doc: rebuild with meson whenever a file changes")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Ciara Power <ciara.power@intel.com>
Tested-by: David Marchand <david.marchand@redhat.com>
This commit is contained in:
Bruce Richardson 2020-06-22 15:00:02 +01:00 committed by Thomas Monjalon
parent a8354c99a9
commit 0e28cca82a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildtools/call-sphinx-build.py
View File

@ -6,13 +6,14 @@
import sys import sys
import os import os
from os.path import join from os.path import join
from subprocess import run, PIPE from subprocess import run, PIPE, STDOUT
from distutils.version import StrictVersion from distutils.version import StrictVersion
(sphinx, src, dst) = sys.argv[1:] # assign parameters to variables (sphinx, src, dst) = sys.argv[1:] # assign parameters to variables
# for sphinx version >= 1.7 add parallelism using "-j auto" # 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] sphinx_cmd = [sphinx]
if StrictVersion(ver) >= StrictVersion('1.7'): if StrictVersion(ver) >= StrictVersion('1.7'):
sphinx_cmd += ['-j', 'auto'] sphinx_cmd += ['-j', 'auto']