diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2016-02-02 10:24:53 +0100 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-02-24 20:06:19 -0800 |
| commit | 070b781b2beb5298cd904fd514ba50e8530b0e2c (patch) | |
| tree | 1aca664ff5052cf15323a3d9417141a5a6ec6905 /tools | |
| parent | 5f3f7b79dbe83144ef5562fa212266c86cd639e2 (diff) | |
| download | talos-obmc-uboot-070b781b2beb5298cd904fd514ba50e8530b0e2c.tar.gz talos-obmc-uboot-070b781b2beb5298cd904fd514ba50e8530b0e2c.zip | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/patman/series.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/patman/series.py b/tools/patman/series.py index 3399f2c8dd..cc6f80b2fd 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, |
