[kteam-tools 2/2] [verify-release-ready] Also check display name 'linux' for derivative fixes

[Andy Whitcroft]

On Mon, Jul 03, 2017 at 11:01:58AM +0200, Juerg Haefliger wrote:
> Currently, if the script is run against a derivative package, fixes
> that have been reported against the master and brought in through a
> rebase are incorrectly flagged as:
>   LP: #<bug> is not package linux-<derivative>
> 
> Fix this by also checking for 'linux' as a valid diplay name, but only
> if the package is a derivative.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
> ---
>  maintscripts/verify-release-ready | 16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready
> index 193820c5955b..f942df77323d 100755
> --- a/maintscripts/verify-release-ready
> +++ b/maintscripts/verify-release-ready
> @@ -353,6 +353,12 @@ class VerifyReleaseReady():
>          changelog_series = changelog[1]['series']
>          changelog_source_package = changelog[1]['package']
>  
> +        # Is this a derivative package?
> +        derivative = False
> +        if ((changelog_source_package.startswith('linux-') and
> +             not changelog_source_package.startswith('linux-lts-'))):

That seem inverted to me?  If we are linux- and not linux-lts- then we are
a derivative?  Also we have linux-hwe* which is one of or other of these.

> +            derivative = True
> +
>          tracker = None
>  
>          for bug in changelog_bugs:
> @@ -374,13 +380,19 @@ class VerifyReleaseReady():
>              is_fix_committed = False
>              for task in lp_bug.bug_tasks:
>                  task_display_name = task.bug_target_display_name.lower()
> -                # if the display name 'linux (ubuntu X)' matches our package continue
> -                if changelog_source_package in task_display_name:
> +
> +                # if the display name 'linux (ubuntu X)' matches our package
> +                # or the package is a derivative and the diplay name is 'linux'
> +                # (which means the fix is in the master tree), continue...
> +                if ((task_display_name.startswith(changelog_source_package + ' ') or
> +                     (derivative and task_display_name.startswith('linux ')))):
>                      is_targeted_to_package = True
> +
>                      # if the display name contains the series, or we are devel continue
>                      if (changelog_series in task_display_name) or \
>                         (changelog_series == s.lp_devel_series.displayname.lower()):
>                          is_targeted_to_series = True
> +
>                          # if we are on a devel or series targeted task check status of that task
>                          if task.status in (u'Fix Committed', u'Fix Released'):
>                              is_fix_committed = True
> -- 
> 2.11.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team