From 7971e6a9c20252b99377e26d8ab286d479dd862e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 23 Aug 2024 09:44:47 +1000
Subject: [PATCH] Cleanup: return error code instead of sys.exit() for
 formatting utils

---
 tools/utils_maintenance/autopep8_format_paths.py | 15 ++++++++-------
 tools/utils_maintenance/clang_format_paths.py    | 10 ++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tools/utils_maintenance/autopep8_format_paths.py b/tools/utils_maintenance/autopep8_format_paths.py
index ef29e61da99..f0e10a1da69 100755
--- a/tools/utils_maintenance/autopep8_format_paths.py
+++ b/tools/utils_maintenance/autopep8_format_paths.py
@@ -235,7 +235,7 @@ def argparse_create() -> argparse.ArgumentParser:
     return parser
 
 
-def main() -> None:
+def main() -> int:
     args = argparse_create().parse_args()
 
     if args.no_subprocess:
@@ -252,7 +252,7 @@ def main() -> None:
         sys.stderr.write("You may want to install autopep8-{:s}, or use the pre-compiled libs repository.\n".format(
             version_str_from_tuple(VERSION_MAX_RECOMMENDED[0:2]),
         ))
-        sys.exit(1)
+        return 1
 
     autopep8_source, version = source_and_version
 
@@ -262,7 +262,7 @@ def main() -> None:
             version_str_from_tuple(version),
             version_str_from_tuple(VERSION_MIN),
         ))
-        sys.exit(1)
+        return 1
     if version > VERSION_MAX_RECOMMENDED:
         sys.stderr.write("Using \"{:s}\"\nWARNING: the autopep8 version is too recent: {:s} > {:s}.\n".format(
             autopep8_source,
@@ -291,14 +291,15 @@ def main() -> None:
     # Happens when users run "make format" passing in individual C/C++ files
     # (and no Python files).
     if not files:
-        return
+        return 0
 
     if args.no_subprocess:
         autopep8_format_no_subprocess(files)
-        return
+    else:
+        autopep8_format(files)
 
-    autopep8_format(files)
+    return 0
 
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())
diff --git a/tools/utils_maintenance/clang_format_paths.py b/tools/utils_maintenance/clang_format_paths.py
index 677ff8d1a36..f8143b988d7 100755
--- a/tools/utils_maintenance/clang_format_paths.py
+++ b/tools/utils_maintenance/clang_format_paths.py
@@ -222,14 +222,14 @@ def argparse_create() -> argparse.ArgumentParser:
     return parser
 
 
-def main() -> None:
+def main() -> int:
     version = clang_format_ensure_version()
     if version is None:
         print("Unable to detect 'clang-format -version'")
-        sys.exit(1)
+        return 1
     if version < VERSION_MIN:
         print("Version of clang-format is too old:", version, "<", VERSION_MIN)
-        sys.exit(1)
+        return 1
 
     args = argparse_create().parse_args()
 
@@ -271,6 +271,8 @@ def main() -> None:
         )
         print()
 
+    return 0
+
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())