summaryrefslogtreecommitdiffstats
path: root/update-blocker-wiki
diff options
context:
space:
mode:
authorJames Laska <jlaska@redhat.com>2011-08-29 08:06:11 -0400
committerJames Laska <jlaska@redhat.com>2011-08-29 08:06:11 -0400
commit308e798dc3fc95de48731cdf1e18e7aa69ed4925 (patch)
treecb91cb66024d55b181b1efa91b465194af6b7c66 /update-blocker-wiki
parente140160c852616d118092c755dc6684bd0157c2d (diff)
downloadscripts-308e798dc3fc95de48731cdf1e18e7aa69ed4925.tar.gz
scripts-308e798dc3fc95de48731cdf1e18e7aa69ed4925.tar.xz
scripts-308e798dc3fc95de48731cdf1e18e7aa69ed4925.zip
Only auto-detect Fedora release when requested
Diffstat (limited to 'update-blocker-wiki')
-rwxr-xr-xupdate-blocker-wiki27
1 files changed, 14 insertions, 13 deletions
diff --git a/update-blocker-wiki b/update-blocker-wiki
index 516c67d..a2f7bc4 100755
--- a/update-blocker-wiki
+++ b/update-blocker-wiki
@@ -196,19 +196,20 @@ if __name__ == '__main__':
wiki = MediaWiki('https://fedoraproject.org/w/api.php', cookie_file=opts.cookiefile)
# Get current Fedora version number
- if opts.verbose: sys.stdout.write('Detecting upcoming Fedora release ... ')
- q = dict(action='expandtemplates',
- text='{{Template:FedoraVersionNumber|next}}',)
- response = wiki.call(q)
- release = response.get('expandtemplates',{}).get('*','')
- 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)
- if opts.nth == 'auto':
- # FIXME - autodetect Alpha, Beta or Final ?
- opts.nth = 'F{release}Beta-accepted'.format(release=release)
+ if opts.blocker == 'auto' or opts.nth == 'auto':
+ if opts.verbose: sys.stdout.write('Detecting upcoming Fedora release ... ')
+ q = dict(action='expandtemplates',
+ text='{{Template:FedoraVersionNumber|next}}',)
+ response = wiki.call(q)
+ release = response.get('expandtemplates',{}).get('*','')
+ 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)
+ if opts.nth == 'auto':
+ # FIXME - autodetect Alpha, Beta or Final ?
+ opts.nth = 'F{release}Beta-accepted'.format(release=release)
# Connect to bugzilla
bz = bugzilla.RHBugzilla3(url='https://bugzilla.redhat.com/xmlrpc.cgi')