]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
patman: Don't try to process checkpatch lines twice
authorSimon Glass <sjg@chromium.org>
Wed, 6 May 2020 22:29:06 +0000 (16:29 -0600)
committerSimon Glass <sjg@chromium.org>
Fri, 12 Jun 2020 02:52:10 +0000 (20:52 -0600)
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@chromium.org>
tools/patman/checkpatch.py

index 16d534b6ae07719908e8450246d96c88bed00ea9..2cfa9778c6d87226d0243cc1645864ab5e5719df 100644 (file)
@@ -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)