From d3cfa9a3c2d7778ad662dec58423b30f74de2111 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Wed, 21 Aug 2024 12:40:44 +0200
Subject: [PATCH] MAINT Minor improvements to format.py

Fail if command returns nonzero exit code when formatting
Use same flags when checking as when formatting as much as possible
---
 tools/cross/format.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/cross/format.py b/tools/cross/format.py
index 4338b058fb9..0d26a3d9507 100644
--- a/tools/cross/format.py
+++ b/tools/cross/format.py
@@ -83,23 +83,23 @@ def filter_files_by_exts(
 
 
 def clang_format(files: List[str], check: bool = False) -> bool:
+    cmd = [CLANG_FORMAT, "--verbose"]
     if check:
-        result = subprocess.run(
-            [CLANG_FORMAT, "--verbose", "--dry-run", "--Werror"] + files
-        )
-        return result.returncode == 0
+        cmd += ["--dry-run", "--Werror"]
     else:
-        subprocess.run([CLANG_FORMAT, "--verbose", "-i"] + files)
-        return True
+        cmd.append("-i")
+    result = subprocess.run(cmd + files)
+    return result.returncode == 0
 
 
 def prettier(files: List[str], check: bool = False) -> bool:
+    cmd = [PRETTIER]
     if check:
-        result = subprocess.run([PRETTIER, "--check"] + files)
-        return result.returncode == 0
+        cmd.append("--check")
     else:
-        subprocess.run([PRETTIER, "--write"] + files)
-        return True
+        cmd.append("--write")
+    result = subprocess.run(cmd + files)
+    return result.returncode == 0
 
 
 def git_get_modified_files(