Skip to content

Commit f75930e

Browse files
encukoumiss-islington
authored andcommitted
gh-145455: Show output of blurb & sphinx-build version commands (GH-145457)
In gh-145455, an outdated dependency caused an import error that was not printed out (`2>&1`); the message instead said that the tools are missing. Don't redirect stderr, to show warnings and failures. Also, switch `blurb` to output a version on a single line (`--version` rather than `help`), and, and don't redirect stdout either. This results in two version info lines being printed out. These get drowned in typical Sphinx output, and can be helpful when debugging. (cherry picked from commit f1de65b) Co-authored-by: Petr Viktorin <encukou@gmail.com>
1 parent 27c6454 commit f75930e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ build:
5656
@if [ -f ../Misc/NEWS ] ; then \
5757
echo "Using existing Misc/NEWS file"; \
5858
cp ../Misc/NEWS build/NEWS; \
59-
elif $(BLURB) help >/dev/null 2>&1 && $(SPHINXBUILD) --version >/dev/null 2>&1; then \
59+
elif $(BLURB) --version && $(SPHINXBUILD) --version ; then \
6060
if [ -d ../Misc/NEWS.d ]; then \
6161
echo "Building NEWS from Misc/NEWS.d with blurb"; \
6262
$(BLURB) merge -f build/NEWS; \

0 commit comments

Comments
 (0)