[U-Boot] [PATCH v2 4/5] tools: patman: Handle missing blank line for 'Series-changes'
Bin Meng
bmeng.cn at gmail.com
Mon Jun 27 08:24:31 CEST 2016
'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 at gmail.com>
Acked-by: Simon Glass <sjg at chromium.org>
---
Changes in v2:
- Geneate warning when blank line is not found in 'Series-changes'
tools/patman/patchstream.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 9ae977f..0612612 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -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:
--
2.7.4
More information about the U-Boot
mailing list