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

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

[Albert ARIBAUD]

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
rathen than a scalar.

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

 tools/patman/series.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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

[Simon Glass]

On 9 November 2015 at 06:19, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
> 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
> rathen than a scalar.
>
> Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>
>  tools/patman/series.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>

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

[Albert ARIBAUD]

Hello Simon,

On Mon, 9 Nov 2015 12:24:55 -0800, Simon Glass <sjg@chromium.org> wrote:
> On 9 November 2015 at 06:19, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
> > 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
> > rathen than a scalar.
> >
> > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> > ---
> >
> >  tools/patman/series.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Acked-by: Simon Glass <sjg@chromium.org>

Note: just spotted a typo, 'rathen' instead of 'rather'. If this patch
gets applied, please fix that on-the-fly.

Amicalement,
-- 
Albert.

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

[Simon Glass]

On 9 November 2015 at 14:36, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
> Hello Simon,
>
> On Mon, 9 Nov 2015 12:24:55 -0800, Simon Glass <sjg@chromium.org> wrote:
>> On 9 November 2015 at 06:19, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
>> > 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
>> > rathen than a scalar.
>> >
>> > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
>> > ---
>> >
>> >  tools/patman/series.py | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Acked-by: Simon Glass <sjg@chromium.org>
>
> Note: just spotted a typo, 'rathen' instead of 'rather'. If this patch
> gets applied, please fix that on-the-fly.
>
> Amicalement,
> --
> Albert.

Fixed typo and

Applied to u-boot-dm, thanks!

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

[Simon Glass]

Hi Albert,

On 13 November 2015 at 19:35, Simon Glass <sjg@chromium.org> wrote:
> On 9 November 2015 at 14:36, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
>> Hello Simon,
>>
>> On Mon, 9 Nov 2015 12:24:55 -0800, Simon Glass <sjg@chromium.org> wrote:
>>> On 9 November 2015 at 06:19, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
>>> > 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
>>> > rathen than a scalar.
>>> >
>>> > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
>>> > ---
>>> >
>>> >  tools/patman/series.py | 2 +-
>>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> Acked-by: Simon Glass <sjg@chromium.org>
>>
>> Note: just spotted a typo, 'rathen' instead of 'rather'. If this patch
>> gets applied, please fix that on-the-fly.
>>
>> Amicalement,
>> --
>> Albert.
>
> Fixed typo and
>
> Applied to u-boot-dm, thanks!

Hmm, actually I've had to drop this as it breaks 'Series-version'.
That currently does not expect a list.

I wonder if Series-notes needs a special case, instead?

Regards,
Simon

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

[Albert ARIBAUD]

Hello Simon,

On Thu, 19 Nov 2015 20:29:11 -0700, Simon Glass <sjg@chromium.org>
wrote:
> Hi Albert,
> 
> On 13 November 2015 at 19:35, Simon Glass <sjg@chromium.org> wrote:
> > On 9 November 2015 at 14:36, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
> >> Hello Simon,
> >>
> >> On Mon, 9 Nov 2015 12:24:55 -0800, Simon Glass <sjg@chromium.org> wrote:
> >>> On 9 November 2015 at 06:19, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
> >>> > 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
> >>> > rathen than a scalar.
> >>> >
> >>> > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> >>> > ---
> >>> >
> >>> >  tools/patman/series.py | 2 +-
> >>> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> Acked-by: Simon Glass <sjg@chromium.org>
> >>
> >> Note: just spotted a typo, 'rathen' instead of 'rather'. If this patch
> >> gets applied, please fix that on-the-fly.
> >>
> >> Amicalement,
> >> --
> >> Albert.
> >
> > Fixed typo and
> >
> > Applied to u-boot-dm, thanks!
> 
> Hmm, actually I've had to drop this as it breaks 'Series-version'.
> That currently does not expect a list.

Hmm, I can't reproduce this here. How do you trigger the Series-version
break?

> I wonder if Series-notes needs a special case, instead?
> 
> Regards,
> Simon

Amicalement,
-- 
Albert.

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

[Simon Glass]

Hi Albert,

On 31 January 2016 at 09:51, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
> Hello Simon,
>
> On Thu, 19 Nov 2015 20:29:11 -0700, Simon Glass <sjg@chromium.org>
> wrote:
>> Hi Albert,
>>
>> On 13 November 2015 at 19:35, Simon Glass <sjg@chromium.org> wrote:
>> > On 9 November 2015 at 14:36, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
>> >> Hello Simon,
>> >>
>> >> On Mon, 9 Nov 2015 12:24:55 -0800, Simon Glass <sjg@chromium.org> wrote:
>> >>> On 9 November 2015 at 06:19, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
>> >>> > 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
>> >>> > rathen than a scalar.
>> >>> >
>> >>> > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
>> >>> > ---
>> >>> >
>> >>> >  tools/patman/series.py | 2 +-
>> >>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>>
>> >>> Acked-by: Simon Glass <sjg@chromium.org>
>> >>
>> >> Note: just spotted a typo, 'rathen' instead of 'rather'. If this patch
>> >> gets applied, please fix that on-the-fly.
>> >>
>> >> Amicalement,
>> >> --
>> >> Albert.
>> >
>> > Fixed typo and
>> >
>> > Applied to u-boot-dm, thanks!
>>
>> Hmm, actually I've had to drop this as it breaks 'Series-version'.
>> That currently does not expect a list.
>
> Hmm, I can't reproduce this here. How do you trigger the Series-version
> break?

I created a commit with a Series-version: in it. Then, running patman
gives a run-time error because it is expecting a single value, not an
array.

>
>> I wonder if Series-notes needs a special case, instead?
>>
>> Regards,
>> Simon
>
> Amicalement,
> --
> Albert.


Regards,
Simon

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

[Albert ARIBAUD]

Hello Simon,

> >> Hmm, actually I've had to drop this as it breaks 'Series-version'.
> >> That currently does not expect a list.
> >
> > Hmm, I can't reproduce this here. How do you trigger the Series-version
> > break?
> 
> I created a commit with a Series-version: in it. Then, running patman
> gives a run-time error because it is expecting a single value, not an
> array.

Thanks.

Weird. That's what I'd done when starting v2 (so that I could test my
commit with itself) except I also had Series-note: in it, and it would
not trigger this. Then I rolled back to v1 and did it again, and this
time I get the error. And before anyone asks, I'd run git clean- xfd
so there was no precompiled Python in the way.

Oh well.

v2 just sent.

Amicalement,
-- 
Albert.