| Message ID | 20170428075144.6370-1-kleber.souza@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 04/28/2017 09:51 AM, Kleber Sacilotto de Souza wrote: > The check for the 'release tracking bug' was looking only for the old > style tracking bug on the changelog: > > * Release Tracking Bug > - LP: #<lp number> > > Change it catch also the new style: > > * linux: <version> -proposed tracker (LP: #<lp number>) > > Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > maintscripts/verify-release-ready | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready > index 7413cab5..3a24e1f2 100755 > --- a/maintscripts/verify-release-ready > +++ b/maintscripts/verify-release-ready > @@ -215,6 +215,11 @@ class VerifyReleaseReady(): > # > found_tracker = False > for line in changelog[1]['content']: > + if '-proposed tracker' in line: > + found_tracker = True > + if 'Tracking Bug' in line: > + found_tracker = True > + continue The old style of mentioning the tracking bug should go away, so the script should encourage to use only the new one. 'create-release-tracker' is still using the old style though, so it also needs to be fixed. I will send a patchset to fix both. > if found_tracker: > if '#' in line: > (junk, tracker_id) = line.split('#') > @@ -224,8 +229,6 @@ class VerifyReleaseReady(): > if tracker_id == 'warning': > stdo(colored('\t%s\n' % line, 'yellow')) > break > - if 'Tracking Bug' in line: > - found_tracker = True > s.status('release tracking bug', found_tracker) > > # If we are on a topic branch make sure we are not re-using the same tracking >
diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready index 7413cab5..3a24e1f2 100755 --- a/maintscripts/verify-release-ready +++ b/maintscripts/verify-release-ready @@ -215,6 +215,11 @@ class VerifyReleaseReady(): # found_tracker = False for line in changelog[1]['content']: + if '-proposed tracker' in line: + found_tracker = True + if 'Tracking Bug' in line: + found_tracker = True + continue if found_tracker: if '#' in line: (junk, tracker_id) = line.split('#') @@ -224,8 +229,6 @@ class VerifyReleaseReady(): if tracker_id == 'warning': stdo(colored('\t%s\n' % line, 'yellow')) break - if 'Tracking Bug' in line: - found_tracker = True s.status('release tracking bug', found_tracker) # If we are on a topic branch make sure we are not re-using the same tracking
The check for the 'release tracking bug' was looking only for the old style tracking bug on the changelog: * Release Tracking Bug - LP: #<lp number> Change it catch also the new style: * linux: <version> -proposed tracker (LP: #<lp number>) Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> --- maintscripts/verify-release-ready | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)