From: Simon Glass <sjg@chromium.org>
Date: Wed, 6 May 2020 22:29:07 +0000 (-0600)
Subject: patman: Handle checkpatch output with notes and code
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=666eb15e923e93872dbca1b834ce123a327fc9b3;p=u-boot.git

patman: Handle checkpatch output with notes and code

If checkpatch is configured to output code we should ignore it. Similarly,
notes should be ignored.

Update the logic to handle these situations.

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

diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 2cfa9778c6..5426bb9e9e 100644
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -85,7 +85,8 @@ def CheckPatch(fname, verbose=False):
     re_warning = re.compile(emacs_prefix + 'WARNING:(?:[A-Z_]+:)? (.*)')
     re_check = re.compile('CHECK: (.*)')
     re_file = re.compile('#\d+: FILE: ([^:]*):(\d+):')
-
+    re_note = re.compile('NOTE: (.*)')
+    indent = ' ' * 6
     for line in result.stdout.splitlines():
         if verbose:
             print(line)
@@ -96,6 +97,14 @@ def CheckPatch(fname, verbose=False):
                 result.problems.append(item)
                 item = {}
             continue
+        if re_note.match(line):
+            continue
+        # Skip lines which quote code
+        if line.startswith(indent):
+            continue
+        # Skip code quotes and #<n>
+        if line.startswith('+') or line.startswith('#'):
+            continue
         match = re_stats_full.match(line)
         if not match:
             match = re_stats.match(line)