LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patman: fix series-notes handling for buildman 

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@aribaud.net>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Albert ARIBAUD 2016-02-02 10:24:53 +01:00 committed by Simon Glass
parent 5f3f7b79db
commit 070b781b2b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/patman/series.py
View File

@ -69,7 +69,10 @@ class Series(dict):
# Otherwise just set the value # Otherwise just set the value
elif name in valid_series: elif name in valid_series:
self[name] = value if name=="notes":
self[name] = [value]
else:
self[name] = value
else: else:
raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid " raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid "
"options are %s" % (commit.hash, line, name, "options are %s" % (commit.hash, line, name,