From f01c4b0a7a0210f686ad461e02c3ac1617ec62d4 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sun, 13 Apr 2025 11:29:44 +0100
Subject: [PATCH 1/2] Ensure exit status is returned by `build_docs.py`

---
 build_docs.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/build_docs.py b/build_docs.py
index faa8648..1249e1e 100755
--- a/build_docs.py
+++ b/build_docs.py
@@ -911,20 +911,21 @@ def _checkout_name(select_output: str | None) -> str:
     return "cpython"
 
 
-def main() -> None:
+def main() -> int:
     """Script entry point."""
     args = parse_args()
     setup_logging(args.log_directory, args.select_output)
     load_environment_variables()
 
     if args.select_output is None:
-        build_docs_with_lock(args, "build_docs.lock")
-    elif args.select_output == "no-html":
-        build_docs_with_lock(args, "build_docs_archives.lock")
-    elif args.select_output == "only-html":
-        build_docs_with_lock(args, "build_docs_html.lock")
-    elif args.select_output == "only-html-en":
-        build_docs_with_lock(args, "build_docs_html_en.lock")
+        return build_docs_with_lock(args, "build_docs.lock")
+    if args.select_output == "no-html":
+        return build_docs_with_lock(args, "build_docs_archives.lock")
+    if args.select_output == "only-html":
+        return build_docs_with_lock(args, "build_docs_html.lock")
+    if args.select_output == "only-html-en":
+        return build_docs_with_lock(args, "build_docs_html_en.lock")
+    return 2
 
 
 def parse_args() -> argparse.Namespace:
@@ -1397,4 +1398,4 @@ def purge_surrogate_key(http: urllib3.PoolManager, surrogate_key: str) -> None:
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    raise SystemExit(main())

From c94ca49ee63ca01e26f67ee5d5496732080d4dce Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sun, 13 Apr 2025 12:03:44 +0100
Subject: [PATCH 2/2] Invert condition

---
 build_docs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build_docs.py b/build_docs.py
index 1249e1e..5d6e801 100755
--- a/build_docs.py
+++ b/build_docs.py
@@ -925,7 +925,7 @@ def main() -> int:
         return build_docs_with_lock(args, "build_docs_html.lock")
     if args.select_output == "only-html-en":
         return build_docs_with_lock(args, "build_docs_html_en.lock")
-    return 2
+    return EX_FAILURE
 
 
 def parse_args() -> argparse.Namespace:
@@ -1074,12 +1074,12 @@ def build_docs_with_lock(args: argparse.Namespace, lockfile_name: str) -> int:
         return EX_FAILURE
 
     try:
-        return EX_OK if build_docs(args) else EX_FAILURE
+        return build_docs(args)
     finally:
         lock.close()
 
 
-def build_docs(args: argparse.Namespace) -> bool:
+def build_docs(args: argparse.Namespace) -> int:
     """Build all docs (each language and each version)."""
     logging.info("Full build start.")
     start_time = perf_counter()
@@ -1160,7 +1160,7 @@ def build_docs(args: argparse.Namespace) -> bool:
 
     logging.info("Full build done (%s).", format_seconds(perf_counter() - start_time))
 
-    return any_build_failed
+    return EX_FAILURE if any_build_failed else EX_OK
 
 
 def parse_versions_from_devguide(http: urllib3.PoolManager) -> Versions: