[U-Boot] [PATCH 1/4] patman: fix end of changes detection

Ilya Yanok ilya.yanok at cogentembedded.com
Tue Aug 7 11:46:05 CEST 2012


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 at cogentembedded.com>
---
 tools/patman/patchstream.py |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index be40af3..036b129 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
-- 
1.7.9.5



More information about the U-Boot mailing list