[PATCH 3/6] patman: Don't try to process checkpatch lines twice

Simon Glass sjg at chromium.org
Thu May 7 00:29:06 CEST 2020


Once we have determined what the line refers to there is no point in
processing it further. Update the logic to continue to the next line in
these cases.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/patman/checkpatch.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 16d534b6ae..2cfa9778c6 100644
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -91,9 +91,11 @@ def CheckPatch(fname, verbose=False):
             print(line)
 
         # A blank line indicates the end of a message
-        if not line and item:
-            result.problems.append(item)
-            item = {}
+        if not line:
+            if item:
+                result.problems.append(item)
+                item = {}
+            continue
         match = re_stats_full.match(line)
         if not match:
             match = re_stats.match(line)
@@ -105,10 +107,13 @@ def CheckPatch(fname, verbose=False):
                 result.lines = int(match.group(4))
             else:
                 result.lines = int(match.group(3))
+            continue
         elif re_ok.match(line):
             result.ok = True
+            continue
         elif re_bad.match(line):
             result.ok = False
+            continue
         err_match = re_error.match(line)
         warn_match = re_warning.match(line)
         file_match = re_file.match(line)
-- 
2.26.2.645.ge9eca65c58-goog



More information about the U-Boot mailing list