Merge branch 'master' into verbose-rewrite

This commit is contained in:
Daniel Martí 2013-11-01 13:55:42 +01:00
commit d525d987e2
3 changed files with 94 additions and 33 deletions

View file

@ -335,6 +335,7 @@ def main():
logmsg = None
tag = None
msg = None
mode = app['Update Check Mode']
if mode == 'Tags':
(version, vercode, tag) = check_tags(app, config['sdk_path'])
@ -348,17 +349,21 @@ def main():
(version, vercode) = check_http(app)
elif mode == 'Static':
version = None
vercode = 'Checking disabled'
msg = 'Checking disabled'
elif mode == 'None':
version = None
vercode = 'Checking disabled'
msg = 'Checking disabled'
else:
version = None
vercode = 'Invalid update check method'
msg = 'Invalid update check method'
if vercode and app['Vercode Operation']:
op = app['Vercode Operation'].replace("%c", str(int(vercode)))
vercode = str(eval(op))
updating = False
if not version:
print "..." + vercode
print "...%s" % msg
elif vercode == app['Current Version Code']:
print "...up to date"
else: