brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-29 08:00:26 +09:00
Code Issues Projects Releases Wiki Activity

tools: patman: Handle tag sections without an 'END'

Browse Source 
'Cover-letter', 'Series-notes' and 'Commit-notes' tags require an
'END' to be put at the end of its section. If we forget to put an
'END' in those sections, and these sections are followed by another
patman tag, patman generates incorrect patches. This adds codes to
handle such scenario.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2016-06-26 23:24:29 -07:00 committed by Simon Glass
parent e7df218c3b
commit 13b98d95ba
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/patman/patchstream.py
View File

@ -169,6 +169,26 @@ class PatchStream:
elif commit_match:
self.state = STATE_MSG_HEADER
# If a tag is detected, but we are already in a section,
# this means 'END' is missing for that section, fix it up.
if series_tag_match or commit_tag_match or \
cover_match or cover_cc_match or signoff_match:
if self.in_section:
self.warn.append("Missing 'END' in section '%s'" % self.in_section)
if self.in_section == 'cover':
self.series.cover = self.section
elif self.in_section == 'notes':
if self.is_log:
self.series.notes += self.section
elif self.in_section == 'commit-notes':
if self.is_log:
self.commit.notes += self.section
else:
self.warn.append("Unknown section '%s'" % self.in_section)
self.in_section = None
self.skip_blank = True
self.section = []
# If we are in a section, keep collecting lines until we see END
if self.in_section:
if line == 'END':