mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-02 00:53:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools: patman: Handle missing blank line for 'Series-changes'

Browse Source 
'Series-changes' uses blank line to indicate its end. If that is
missing, series internal state variable 'in_change' may be wrong.
Correct its state.

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:31 -07:00 committed by Simon Glass
parent 0d57718775
commit 57b6b190a8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/patman/patchstream.py
View File

@ -177,10 +177,11 @@ 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 a tag is detected
if series_tag_match or commit_tag_match or \
cover_match or cover_cc_match or signoff_match:
# but we are already in a section, this means 'END' is missing
# for that section, fix it up.
if self.in_section:
self.warn.append("Missing 'END' in section '%s'" % self.in_section)
if self.in_section == 'cover':
@ -196,6 +197,11 @@ class PatchStream:
self.in_section = None
self.skip_blank = True
self.section = []
# but we are already in a change list, that means a blank line
# is missing, fix it up.
if self.in_change:
self.warn.append("Missing 'blank line' in section 'Series-changes'")
self.in_change = 0
# If we are in a section, keep collecting lines until we see END
if self.in_section: