mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 15:02:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve checkupdates output further

Browse source
This commit is contained in:
Ciaran Gultnieks 2014-02-22 10:03:19 +00:00
parent cb92ea1598
commit bb16e37a24
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/checkupdates.py
View file

@ -352,6 +352,7 @@ def main():
tag = None tag = None
msg = None msg = None
vercode = None vercode = None
noverok = False
mode = app['Update Check Mode'] mode = app['Update Check Mode']
if mode.startswith('Tags'): if mode.startswith('Tags'):
pattern = mode[5:] if len(mode) > 4 else None pattern = mode[5:] if len(mode) > 4 else None
@ -368,9 +369,11 @@ def main():
elif mode == 'Static': elif mode == 'Static':
version = None version = None
msg = 'Checking disabled' msg = 'Checking disabled'
noverok = True
elif mode == 'None': elif mode == 'None':
version = None version = None
msg = 'Checking disabled' msg = 'Checking disabled'
noverok = True
else: else:
version = None version = None
msg = 'Invalid update check method' msg = 'Invalid update check method'
@ -381,7 +384,11 @@ def main():
updating = False updating = False
if not version: if not version:
logging.info("...%s" % msg) logmsg = "...{0} : {1}".format(app[id], msg)
if noverok:
logging.info(logmsg)
else:
logging.warn(logmsg)
elif vercode == app['Current Version Code']: elif vercode == app['Current Version Code']:
logging.info("...up to date") logging.info("...up to date")
else: else:
@ -420,7 +427,7 @@ def main():
app['Current Version'] = cv app['Current Version'] = cv
writeit = True writeit = True
except Exception: except Exception:
logging.info("ERROR: Auto Name or Current Version failed for %s due to exception: %s" % (app['id'], traceback.format_exc())) logging.error("Auto Name or Current Version failed for %s due to exception: %s" % (app['id'], traceback.format_exc()))
if updating: if updating:
name = common.getappname(app) name = common.getappname(app)
@ -467,7 +474,7 @@ def main():
ver = common.getcvname(app) ver = common.getcvname(app)
logmsg = "Update %s to %s" % (name, ver) logmsg = "Update %s to %s" % (name, ver)
else: else:
logging.warn('Invalid auto update mode "' + mode + '"') logging.warn('Invalid auto update mode "' + mode + '" on ' + app['id'])
if writeit: if writeit:
metafile = os.path.join('metadata', app['id'] + '.txt') metafile = os.path.join('metadata', app['id'] + '.txt')