From f7279fc66994527fd49946c5e602885630950979 Mon Sep 17 00:00:00 2001 From: James Laska Date: Thu, 1 Sep 2011 14:13:26 -0400 Subject: Add --milestone|-m option to specify the desired release milestone Only valid when using --blocker=auto or --nth=auto --- update-blocker-wiki | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/update-blocker-wiki b/update-blocker-wiki index a2f7bc4..0424878 100755 --- a/update-blocker-wiki +++ b/update-blocker-wiki @@ -103,11 +103,14 @@ def parse_args(): optgrp = optparse.OptionGroup(parser, "Required options") optgrp.add_option('-n', '--name', action='store', default=None, - help='Wiki page name to save results') + help='Wiki page name to save results (required)') optgrp.add_option('--blocker', action='store', default='auto', help='Blocker tracking bug number (default: %default)') optgrp.add_option('--nth', action='store', default='auto', help='Nice-to-Have tracking bug number (default: %default)') + optgrp.add_option('-m', '--milestone', type='choice', action='store', + default=None, choices=['Alpha', 'Beta', 'Final',], + help='Release milestone used when --blocker or --nth are set to \'auto\' (e.g. Alpha, Beta or Final)') optgrp.add_option('-u', '--user', action='store', default=None, help='Mediawiki username') optgrp.add_option('-p', '--passwd', action='store', default=None, @@ -154,6 +157,7 @@ def parse_args(): opts.blocker = sanitize_input(parser, opts.blocker, "Blocker bug number") opts.nth = sanitize_input(parser, opts.nth, "Nice-to-have bug number") opts.name = sanitize_input(parser, opts.name, "Wiki page name") + opts.milestone = sanitize_input(parser, opts.milestone, "Release milestone") return opts @@ -205,11 +209,13 @@ if __name__ == '__main__': if opts.verbose: print release if release.isdigit(): if opts.blocker == 'auto': - # FIXME - autodetect Alpha, Beta or Final ? - opts.blocker = 'F{release}Beta'.format(release=release) + # HACK - the blocker bug format is inconsistently named + opts.blocker = 'F{release}{milestone}'.format(release=release, + milestone=re.sub('Final', 'Blocker', opts.milestone)) if opts.nth == 'auto': - # FIXME - autodetect Alpha, Beta or Final ? - opts.nth = 'F{release}Beta-accepted'.format(release=release) + # HACK - the blocker bug format is inconsistently named + opts.nth = 'F{release}{milestone}-accepted'.format(release=release, + milestone=re.sub('Final', '', opts.milestone)) # Connect to bugzilla bz = bugzilla.RHBugzilla3(url='https://bugzilla.redhat.com/xmlrpc.cgi') -- cgit