aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIlya Yanok <ilya.yanok@cogentembedded.com>2012-08-06 23:46:05 +0000
committerWolfgang Denk <wd@denx.de>2012-09-02 16:22:49 +0200
commit05e5b73506f0a07660f0930f4ecec6e6f5b7cd03 (patch)
tree8f49aa5194dd12da65f354783d8f857d00bfee6c /tools
parent69fd2d3b0559f221a45e9a86b8ead16490f4e47b (diff)
downloadu-boot-linaro-stable-05e5b73506f0a07660f0930f4ecec6e6f5b7cd03.tar.gz
patman: fix end of changes detection
Changes may end in '---' line or Signoff line (generated by git format-patch) in case of Series-changes: lines being the last ones in commit message. So detect it properly. Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/patman/patchstream.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index be40af3ed..036b1290f 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -36,6 +36,9 @@ re_remove = re.compile('^BUG=|^TEST=|^Change-Id:|^Review URL:'
# Lines which are allowed after a TEST= line
re_allowed_after_test = re.compile('^Signed-off-by:')
+# Signoffs
+re_signoff = re.compile('^Signed-off-by:')
+
# The start of the cover letter
re_cover = re.compile('^Cover-letter:')
@@ -207,6 +210,9 @@ class PatchStream:
if is_blank:
# Blank line ends this change list
self.in_change = 0
+ elif line == '---' or re_signoff.match(line):
+ self.in_change = 0
+ out = self.ProcessLine(line)
else:
self.series.AddChange(self.in_change, self.commit, line)
self.skip_blank = False