From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 3 Mar 2026 14:16:05 +0000 (+0100)
Subject: [3.14] gh-145455: Show output of blurb & sphinx-build version commands (GH-145457... 
X-Git-Tag: v3.14.4~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85f8073684f2f9a4a41035e69c3421a8da7fd864;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-145455: Show output of blurb & sphinx-build version commands (GH-145457) (#145461)

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 f1de65b3669226d563802a32b78a2294e971151a)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
---

diff --git a/Doc/Makefile b/Doc/Makefile
index d39c2fe3c3f2..5b7fdf8ec08e 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -58,7 +58,7 @@ build:
 	@if [ -f  ../Misc/NEWS ] ; then \
 		echo "Using existing Misc/NEWS file"; \
 		cp ../Misc/NEWS build/NEWS; \
-	elif $(BLURB) help >/dev/null 2>&1 && $(SPHINXBUILD) --version >/dev/null 2>&1; then \
+	elif $(BLURB) --version && $(SPHINXBUILD) --version ; then \
 		if [ -d ../Misc/NEWS.d ]; then \
 			echo "Building NEWS from Misc/NEWS.d with blurb"; \
 			$(BLURB) merge -f build/NEWS; \