[U-Boot] [PATCH v2] patman: fix series-notes handling for buildman

Albert ARIBAUD albert.u.boot at aribaud.net
Tue Feb 2 10:24:53 CET 2016


A patman series with a 'Series-notes' section causes
buildman to crash with:

    self.series.notes += self.section
    TypeError: cannot concatenate 'str' and 'list' objects

Fix by initializing series.notes as a one-element array
rather than a scalar.

Signed-off-by: Albert ARIBAUD <albert.u.boot at aribaud.net>
---

Changes in v2:
- fix typo in commit message ("rathen" -> "rather")
- actually limit array initialization to series.notes

 tools/patman/series.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/patman/series.py b/tools/patman/series.py
index 3399f2c..cc6f80b 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -69,7 +69,10 @@ class Series(dict):
 
         # Otherwise just set the value
         elif name in valid_series:
-            self[name] = value
+            if name=="notes":
+                self[name] = [value]
+            else:
+                self[name] = value
         else:
             raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid "
                         "options are %s" % (commit.hash, line, name,
-- 
2.5.0



More information about the U-Boot mailing list