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: 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:
parent
a8354c99a9
commit
0e28cca82a
@ -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']
|
||||
|
Loading…
Reference in New Issue
Block a user