From a717e20e3070717f5b9d9a2e45d8b5cd2ef8be89 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 23 Aug 2021 13:18:06 +0200 Subject: ci: Ignore uncrustify calls resulting in unsuccessful return codes If for some reason uncrustify gets angry at our file and indent on/off marks, it will result in an error code other than 0. Since in those cases there is no output to diff with, we misinterpret those situations as "the whole file should be deleted", which is far from it. --- check-style.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check-style.py b/check-style.py index ac2ffcaad..a326cd311 100755 --- a/check-style.py +++ b/check-style.py @@ -76,6 +76,10 @@ def reformat_chunks(chunks, rewrite): # uncrustify chunk proc = subprocess.Popen(["uncrustify", "-c", uncrustify_cfg, "-f", tmp.name], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + proc.wait() + if proc.returncode != 0: + continue + reindented = proc.stdout.readlines() tmp.close() -- cgit v1.2.1