From fa0f9bf1af7c8e160416048e84091e4b7b31252a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 11 Mar 2014 09:03:18 +0100 Subject: [PATCH] Treat None and Static UCMs equally when doing checkupdates --- fdroidserver/checkupdates.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index bd51dd31..5672e71f 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -340,7 +340,7 @@ def main(): for app in apps: - if options.autoonly and app['Auto Update Mode'] == 'None': + if options.autoonly and app['Auto Update Mode'] in ('None', 'Static'): logging.debug("Nothing to do for %s..." % app['id']) continue @@ -366,11 +366,7 @@ def main(): (version, vercode) = check_repotrunk(app) elif mode == 'HTTP': (version, vercode) = check_http(app) - elif mode == 'Static': - version = None - msg = 'Checking disabled' - noverok = True - elif mode == 'None': + elif mode in ('None', 'Static'): version = None msg = 'Checking disabled' noverok = True @@ -398,7 +394,7 @@ def main(): writeit = True # Do the Auto Name thing as well as finding the CV real name - if len(app["Repo Type"]) > 0 and mode != 'None': + if len(app["Repo Type"]) > 0 and mode not in ('None', 'Static'): try: @@ -438,7 +434,7 @@ def main(): if options.auto: mode = app['Auto Update Mode'] - if mode == 'None': + if mode in ('None', 'Static'): pass elif mode.startswith('Version '): pattern = mode[8:]