summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-10-29 21:46:31 -0600
committerSimon Glass <sjg@chromium.org>2020-11-05 09:11:31 -0700
commitb5e188131f048ad57420545c7e867e80d60b835b (patch)
treea20395598d2cdd075453ebf710869d90225227ea /tools
parent9994baadc0317e1a6a252b2b873f47f9c3390b57 (diff)
patman: Don't ignore lines starting with hash
These lines can indicate a continuation of an error and should not be ignored. Fix this. Fixes: 666eb15e923 ("patman: Handle checkpatch output with notes and code") Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/patman/checkpatch.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 263bac3fc9..98d962cd50 100644
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -95,6 +95,7 @@ def CheckPatch(fname, verbose=False, show_types=False):
re_check = re.compile('CHECK:%s (.*)' % type_name)
re_file = re.compile('#\d+: FILE: ([^:]*):(\d+):')
re_note = re.compile('NOTE: (.*)')
+ re_new_file = re.compile('new file mode .*')
indent = ' ' * 6
for line in result.stdout.splitlines():
if verbose:
@@ -111,8 +112,10 @@ def CheckPatch(fname, verbose=False, show_types=False):
# Skip lines which quote code
if line.startswith(indent):
continue
- # Skip code quotes and #<n>
- if line.startswith('+') or line.startswith('#'):
+ # Skip code quotes
+ if line.startswith('+'):
+ continue
+ if re_new_file.match(line):
continue
match = re_stats_full.match(line)
if not match: