GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-01 12:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

patman: Improve handling of files

Browse source 
Sometimes warnings are associated with a file and sometimes with the
patch as a whole. Update the regular expression to handle both cases,
even in emacs mode. Also add support for detecting new files.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-10-29 21:46:33 -06:00
parent a12ad7c940
commit b3348522b7
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/patman/checkpatch.py
View file

@ -93,7 +93,7 @@ def CheckPatch(fname, verbose=False, show_types=False):
re_error = re.compile('ERROR:%s (.*)' % type_name) re_error = re.compile('ERROR:%s (.*)' % type_name)
re_warning = re.compile(emacs_prefix + 'WARNING:%s (.*)' % type_name) re_warning = re.compile(emacs_prefix + 'WARNING:%s (.*)' % type_name)
re_check = re.compile('CHECK:%s (.*)' % type_name) re_check = re.compile('CHECK:%s (.*)' % type_name)
re_file = re.compile('#\d+: FILE: ([^:]*):(\d+):') re_file = re.compile('#(\d+): (FILE: ([^:]*):(\d+):)?')
re_note = re.compile('NOTE: (.*)') re_note = re.compile('NOTE: (.*)')
re_new_file = re.compile('new file mode .*') re_new_file = re.compile('new file mode .*')
indent = ' ' * 6 indent = ' ' * 6
@ -153,8 +153,13 @@ def CheckPatch(fname, verbose=False, show_types=False):
item['msg'] = check_match.group(2) item['msg'] = check_match.group(2)
item['type'] = 'check' item['type'] = 'check'
elif file_match: elif file_match:
item['file'] = file_match.group(1) err_fname = file_match.group(3)
item['line'] = int(file_match.group(2)) if err_fname:
item['file'] = err_fname
item['line'] = int(file_match.group(4))
else:
item['file'] = '<patch>'
item['line'] = int(file_match.group(1))
elif subject_match: elif subject_match:
item['file'] = '<patch subject>' item['file'] = '<patch subject>'
item['line'] = None item['line'] = None