Commit 13b98d95 authored by Bin Meng's avatar Bin Meng Committed by Simon Glass

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

'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: default avatarBin Meng <bmeng.cn@gmail.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent e7df218c
......@@ -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':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment