clang-format: fail gracefully when clang-format itself aborts am: f363ab9d13 am: 23e637629c am: 71d3de9a45

am: ee12b72f62

Change-Id: I54fd05b21e5301cbbdb777afa69d133175b43c7b

1 files changed, 9 insertions, 1 deletions

diff --git a/tools/clang-format.py b/tools/clang-format.py
index ac9e826..998eb49 100755
--- a/tools/clang-format.py
+++ b/tools/clang-format.py
@@ -78,7 +78,15 @@ def main(argv):
         cmd.extend(['%s^' % opts.commit, opts.commit])
     cmd.extend(['--'] + opts.files)
 
-    stdout = rh.utils.run_command(cmd, capture_output=True).output
+    # Fail gracefully if clang-format itself aborts/fails.
+    try:
+        result = rh.utils.run_command(cmd, capture_output=True)
+    except rh.utils.RunCommandError as e:
+        print('clang-format failed:\n%s' % (e,), file=sys.stderr)
+        print('\nPlease report this to the clang team.', file=sys.stderr)
+        return 1
+
+    stdout = result.output
     if stdout.rstrip('\n') == 'no modified files to format':
         # This is always printed when only files that clang-format does not
         # understand were modified.