[v2] utils: checkstyle.py: Fix known_trailers sort order

19682 diff mbox series

From: Hans de Goede <hdegoede@redhat.com>

An unruly libcamera maintainer merged the wrong patch adding the
Co-developed-by: tag to the known_trailers.

Fix the sort order alphabetically to match the version which should have
been merged.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
Keeping Hans' authorship on the commit to reflect that /he/ got the
final code state right. But I keep getting things wrong ;-)

v2:
 - move the line rather than duplicate it!


 utils/checkstyle.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Hi,

On 3/11/24 3:26 PM, Kieran Bingham wrote:
> From: Hans de Goede <hdegoede@redhat.com>
> 
> An unruly libcamera maintainer merged the wrong patch adding the
> Co-developed-by: tag to the known_trailers.
> 
> Fix the sort order alphabetically to match the version which should have
> been merged.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> ---
> Keeping Hans' authorship on the commit to reflect that /he/ got the
> final code state right. But I keep getting things wrong ;-)
> 
> v2:
>  - move the line rather than duplicate it!

Thanks, this looks good to me.

Regards,

Hans





>  utils/checkstyle.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/checkstyle.py b/utils/checkstyle.py
> index 52cf770c9da3..db5a550d518f 100755
> --- a/utils/checkstyle.py
> +++ b/utils/checkstyle.py
> @@ -471,6 +471,7 @@ class TrailersChecker(CommitChecker):
>      known_trailers = {
>          'Acked-by': email_regex,
>          'Bug': link_regex,
> +        'Co-developed-by': email_regex,
>          'Fixes': commit_regex,
>          'Link': link_regex,
>          'Reported-by': validate_reported_by,
> @@ -478,7 +479,6 @@ class TrailersChecker(CommitChecker):
>          'Signed-off-by': email_regex,
>          'Suggested-by': email_regex,
>          'Tested-by': email_regex,
> -        'Co-developed-by': email_regex,
>      }
>  
>      trailer_regex = re.compile(r'([A-Z][a-zA-Z-]*)\s*:\s*(.*)')

Quoting Hans de Goede (2024-03-11 14:27:13)
> Hi,
> 
> On 3/11/24 3:26 PM, Kieran Bingham wrote:
> > From: Hans de Goede <hdegoede@redhat.com>
> > 
> > An unruly libcamera maintainer merged the wrong patch adding the
> > Co-developed-by: tag to the known_trailers.
> > 
> > Fix the sort order alphabetically to match the version which should have
> > been merged.
> > 
> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> > ---
> > Keeping Hans' authorship on the commit to reflect that /he/ got the
> > final code state right. But I keep getting things wrong ;-)
> > 
> > v2:
> >  - move the line rather than duplicate it!
> 
> Thanks, this looks good to me.

Thanks, tree 'corrected' now.
--
Kieran