Message ID | 1486065183-26353-1-git-send-email-kamal@canonical.com |
---|---|
State | New |
Headers | show |
On 02.02.2017 20:53, Kamal Mostafa wrote: > Bug numbers should be extracted from the generated debian/changelog (not > debian.master/changelog) in order to work properly for derivative kernels. I have not looked at the class yet, just wondering whether there would not be a construct to refer to debian.$derivative/changelog. The way it is done below is working but maybe not always. Though it is probably an additional check for having run "debian/rules clean"... -Stefan > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > maintscripts/verify-release-ready | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready > index da27c77..fdadf1d 100755 > --- a/maintscripts/verify-release-ready > +++ b/maintscripts/verify-release-ready > @@ -342,10 +342,10 @@ class VerifyReleaseReady(): > s.status(msg, True) > > def verify_changelog_bugs(s): > - master_changelog = Debian.master_changelog()[1] > - changelog_bugs = master_changelog['bugs'] > - changelog_series = master_changelog['series'] > - changelog_source_package = master_changelog['package'] > + changelog = Debian.changelog() > + changelog_bugs = changelog[1]['bugs'] > + changelog_series = changelog[1]['series'] > + changelog_source_package = changelog[1]['package'] > > for bug in changelog_bugs: > # Error on private or invalid bugs >
I think this makes sense as it will definitely require an 'fdr clean' beforehand.
diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready index da27c77..fdadf1d 100755 --- a/maintscripts/verify-release-ready +++ b/maintscripts/verify-release-ready @@ -342,10 +342,10 @@ class VerifyReleaseReady(): s.status(msg, True) def verify_changelog_bugs(s): - master_changelog = Debian.master_changelog()[1] - changelog_bugs = master_changelog['bugs'] - changelog_series = master_changelog['series'] - changelog_source_package = master_changelog['package'] + changelog = Debian.changelog() + changelog_bugs = changelog[1]['bugs'] + changelog_series = changelog[1]['series'] + changelog_source_package = changelog[1]['package'] for bug in changelog_bugs: # Error on private or invalid bugs
Bug numbers should be extracted from the generated debian/changelog (not debian.master/changelog) in order to work properly for derivative kernels. Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- maintscripts/verify-release-ready | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)