summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laska <jlaska@redhat.com>2011-09-01 14:13:26 -0400
committerJames Laska <jlaska@redhat.com>2011-09-01 14:13:26 -0400
commitf7279fc66994527fd49946c5e602885630950979 (patch)
tree966c15b40c126f3454480c14cd6e05e92b6f77ca
parent308e798dc3fc95de48731cdf1e18e7aa69ed4925 (diff)
downloadscripts-f7279fc66994527fd49946c5e602885630950979.tar.gz
scripts-f7279fc66994527fd49946c5e602885630950979.tar.xz
scripts-f7279fc66994527fd49946c5e602885630950979.zip
Add --milestone|-m option to specify the desired release milestone
Only valid when using --blocker=auto or --nth=auto
-rwxr-xr-xupdate-blocker-wiki16
1 files 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')