Skip to content

Commit bd86b7e

Browse files
committed
gh-145455: Show output of blurb & sphinx-build version commands
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. Switch `blurb` to output a version on a single line (`--version` rather than `help`), and don't redirect stderr, to show warnings and failures. Also, don't redirect stdout. This results in two extra lines with version info, which get drowned in typical Sphinx output, and can be helpful when debugging.
1 parent 98b1e51 commit bd86b7e

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
@@ -58,7 +58,7 @@ build:
5858
@if [ -f ../Misc/NEWS ] ; then \
5959
echo "Using existing Misc/NEWS file"; \
6060
cp ../Misc/NEWS build/NEWS; \
61-
elif $(BLURB) help >/dev/null 2>&1 && $(SPHINXBUILD) --version >/dev/null 2>&1; then \
61+
elif $(BLURB) --version && $(SPHINXBUILD) --version ; then \
6262
if [ -d ../Misc/NEWS.d ]; then \
6363
echo "Building NEWS from Misc/NEWS.d with blurb"; \
6464
$(BLURB) merge -f build/NEWS; \

0 commit comments

Comments
 (0)