Merge branch 'checkupdates_disabled' into 'master'

[checkupdates] Don't fail for disabled apps

See merge request fdroid/fdroidserver!987
This commit is contained in:
Jochen Sprickerhof 2021-07-29 09:49:11 +00:00
commit badc40b816

View file

@ -434,7 +434,8 @@ def checkupdates_app(app):
elif mode == 'HTTP': elif mode == 'HTTP':
(version, vercode) = check_http(app) (version, vercode) = check_http(app)
elif mode in ('None', 'Static'): elif mode in ('None', 'Static'):
raise MetaDataException(_('Checking disabled')) logging.debug('Checking disabled')
return
else: else:
raise MetaDataException(_('Invalid UpdateCheckMode: {mode}').format(mode=mode)) raise MetaDataException(_('Invalid UpdateCheckMode: {mode}').format(mode=mode))
@ -455,7 +456,7 @@ def checkupdates_app(app):
updating = False updating = False
if version is None: if version is None:
logging.warning('no version information found for {appid}'.format(appid=app.id)) raise FDroidException(_('no version information found'))
elif vercode == app.CurrentVersionCode: elif vercode == app.CurrentVersionCode:
logging.debug("...up to date") logging.debug("...up to date")
elif int(vercode) > int(app.CurrentVersionCode): elif int(vercode) > int(app.CurrentVersionCode):