diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2024-01-18 14:22:40 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-01-18 13:43:53 +0000 |
| commit | 9bbbb29809ec7552698680a40e20ec271d929c67 (patch) | |
| tree | 24d900fa9c557053c571319a7e5b0fd189eaffa2 /sources/pyside6/doc/qdoc_spawner.py.in | |
| parent | cb4d09368dd3719e3e17afa07020c4d41fb03100 (diff) | |
doc: propagate error from qdoc_spawner
Amends f2db4487f5902d47496bc9c00896f81566d3b59a.
Task-number: PYSIDE-1106
Change-Id: Ibcc229d28e797235b7d62a471d1ff51917c59d80
Pick-to: 6.6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/doc/qdoc_spawner.py.in')
| -rw-r--r-- | sources/pyside6/doc/qdoc_spawner.py.in | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/sources/pyside6/doc/qdoc_spawner.py.in b/sources/pyside6/doc/qdoc_spawner.py.in index 55afbf6e6..fb0a8f2cd 100644 --- a/sources/pyside6/doc/qdoc_spawner.py.in +++ b/sources/pyside6/doc/qdoc_spawner.py.in @@ -3,19 +3,19 @@ import argparse import subprocess +import os import sys from multiprocessing import Pool, cpu_count from pathlib import Path def run_qdoc(file, qdoc_args, args): - env = { - "BUILDDIR": args.build_dir, - "QT_INSTALL_DOCS": args.qt_install_docs, - "QT_VERSION": args.qt_version, - "QT_VER": ".".join(args.qt_version.split(".")[:2]), - "QT_VERSION_TAG": args.qt_version, - } + env = os.environ + env["BUILDDIR"] = args.build_dir + env["QT_INSTALL_DOCS"] = args.qt_install_docs + env["QT_VERSION"] = args.qt_version + env["QT_VER"] = ".".join(args.qt_version.split(".")[:2]) + env["QT_VERSION_TAG"] = args.qt_version command = [ args.qdoc_bin, @@ -38,6 +38,7 @@ def run_qdoc(file, qdoc_args, args): print(out, file=sys.stdout) if err: print(err, file=sys.stderr) + raise Exception(f"Failing executing the command {command}") else: _.wait() @@ -84,10 +85,14 @@ if __name__ == "__main__": if parallel == "auto": parallel = cpu_count() - # mode: -prepare -no-link-errors - with Pool(int(parallel)) as p: - p.starmap(run_qdoc, [(str(f), ["-prepare", "-no-link-errors"], args) for f in files_prepare]) + try: + # mode: -prepare -no-link-errors + with Pool(int(parallel)) as p: + p.starmap(run_qdoc, [(str(f), ["-prepare", "-no-link-errors"], args) for f in files_prepare]) - # mode: -single-exec - with Pool(int(parallel)) as p: - p.starmap(run_qdoc, [(str(f), ["-single-exec"], args) for f in files_single_exec]) + # mode: -single-exec + with Pool(int(parallel)) as p: + p.starmap(run_qdoc, [(str(f), ["-single-exec"], args) for f in files_single_exec]) + except Exception as e: + print(f"Error while running qdoc_spawner: {e}", file=sys.stderr) + sys.exit(-1) |