DAOS-623 ci: avoid exception in extra.py when clang-format is missing

site_scons/site_tools/extra/extra.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """
 (C) Copyright 2018-2022 Intel Corporation.
+(C) Copyright 2025 Hewlett Packard Enterprise Development LP.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -22,38 +23,42 @@
 MIN_FORMAT_VERSION = 12
 
 
-def _supports_custom_format(clang_exe):
+def _get_version_string():
+    clang_exe = WhereIs('clang-format')
+    if clang_exe is None:
+        return None
+    try:
+        rawbytes = subprocess.check_output([clang_exe, "-version"])
+        match = re.search(r"version ((\d+)(\.\d+)+)", rawbytes.decode('utf-8'))
+        return match.group(1)
+    except subprocess.CalledProcessError:
+        return None
+
+
+def _supports_custom_format(version):
     """Checks if the version of clang-format is new enough.
 
     Older versions complain about some of the options used so enforce a minimum version.
     """
-    try:
-        rawbytes = subprocess.check_output([clang_exe, "-version"])
-        output = rawbytes.decode('utf-8')
-    except subprocess.CalledProcessError:
+    if version is None:
         print("Unsupported clang-format for custom style.  Using Mozilla style.")
         return False
 
-    match = re.search(r"version (\d+)\.", output)
+    match = re.search(r"(\d+)\.", version)
     if match and int(match.group(1)) >= MIN_FORMAT_VERSION:
         return True
 
     print(f'Custom .clang-format wants version {MIN_FORMAT_VERSION}+. Using Mozilla style.')
     return False
 
 
-def _supports_correct_style(clang_exe):
+def _supports_correct_style(version):
     """Checks if the version of clang-format is 14.0.5 or newer.
 
     Older versions contain bugs so will generate incorrectly formatted code on occasion.
     """
-    try:
-        rawbytes = subprocess.check_output([clang_exe, "-version"])
-        output = rawbytes.decode('utf-8')
-    except subprocess.CalledProcessError:
-        return False
 
-    match = re.search(r'version ([\d+\.]+)', output)
+    match = re.search(r'([\d+\.]+)', version)
     if match:
         parts = match.group(1).split('.')
         if int(parts[0]) != 14:
@@ -72,7 +77,7 @@ def _find_indent():
     indent = WhereIs("clang-format")
     if indent is None:
         return None
-    if _supports_custom_format(indent):
+    if _supports_custom_format(_get_version_string()):
         style = "file"
     else:
         style = "Mozilla"
@@ -102,10 +107,11 @@ def _preprocess_emitter(source, target, env):
 
 def main():
     """Check for a supported version of clang-format"""
-    supported = _supports_correct_style(WhereIs('clang-format'))
-    if not supported:
+    version = _get_version_string()
+    if (version is None) or (not _supports_correct_style(version)):
         print('Install clang-format version 14.0.5 or newer to reformat code')
         sys.exit(1)
+    print(f"Clang-format version {version} installed")
     sys.exit(0)