aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass2020-05-06 16:29:08 -0600
committerSimon Glass2020-06-11 20:52:11 -0600
commit37f3bb53b78d13f15634a976ebbfa36499d74290 (patch)
treef8831cbe56bb915665892b6d982122042e60defb /tools
parent666eb15e923e93872dbca1b834ce123a327fc9b3 (diff)
patman: Support warnings in the patch subject
Sometimes checkpatch outputs problems in the patch subject. Add support for parsing this output and reporting it correctly. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/patman/checkpatch.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index 5426bb9e9e9..5ae450d771b 100644
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -127,6 +127,7 @@ def CheckPatch(fname, verbose=False):
warn_match = re_warning.match(line)
file_match = re_file.match(line)
check_match = re_check.match(line)
+ subject_match = line.startswith('Subject:')
if err_match:
item['msg'] = err_match.group(1)
item['type'] = 'error'
@@ -139,6 +140,9 @@ def CheckPatch(fname, verbose=False):
elif file_match:
item['file'] = file_match.group(1)
item['line'] = int(file_match.group(2))
+ elif subject_match:
+ item['file'] = '<patch subject>'
+ item['line'] = None
return result
@@ -157,7 +161,8 @@ def GetWarningMsg(col, msg_type, fname, line, msg):
msg_type = col.Color(col.RED, msg_type)
elif msg_type == 'check':
msg_type = col.Color(col.MAGENTA, msg_type)
- return '%s:%d: %s: %s\n' % (fname, line, msg_type, msg)
+ line_str = '' if line is None else '%d' % line
+ return '%s:%s: %s: %s\n' % (fname, line_str, msg_type, msg)
def CheckPatches(verbose, args):
'''Run the checkpatch.pl script on each patch'''