[U-Boot] [PATCH v2 3/5] tools: patman: Generate cover letter correctly when 'END' is missing

Bin Meng bmeng.cn at gmail.com
Mon Jun 27 08:24:30 CEST 2016


If 'END' is missing in a 'Cover-letter' section, and that section
happens to show up at the very end of the commit message, and the
commit is the last commit of the series, patman fails to generate
cover letter for us. Handle this in CloseCommit of patchstream.

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>

---

Changes in v2:
- Update commit message to explain when such case is hit
- Reset in_section, skip_blank and section variables too

 tools/patman/patchstream.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index ce8ffb8..9ae977f 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -112,6 +112,14 @@ class PatchStream:
         if self.commit and self.is_log:
             self.series.AddCommit(self.commit)
             self.commit = None
+        # If 'END' is missing in a 'Cover-letter' section, and that section
+        # happens to show up at the very end of the commit message, this is
+        # the chance for us to fix it up.
+        if self.in_section == 'cover' and self.is_log:
+            self.series.cover = self.section
+            self.in_section = None
+            self.skip_blank = True
+            self.section = []
 
     def ProcessLine(self, line):
         """Process a single line of a patch file or commit log
-- 
2.7.4



More information about the U-Boot mailing list