From: Bin Meng Date: Mon, 27 Jun 2016 06:24:31 +0000 (-0700) Subject: tools: patman: Handle missing blank line for 'Series-changes' X-Git-Tag: v2016.09-rc1~144 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=57b6b190a8926403dca2444a45c34bed1f62992d;p=oweals%2Fu-boot.git tools: patman: Handle missing blank line for 'Series-changes' '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 Acked-by: Simon Glass --- diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 9ae977f2df..0612612372 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: