Merge branch 'disabled_failed' into 'master'

Excluded disabled metadata in failedBuilds

See merge request fdroid/fdroidserver!897
This commit is contained in:
Hans-Christoph Steiner 2021-04-06 09:56:39 +00:00
commit 81fb9d4d63

View file

@ -166,6 +166,9 @@ def status_update_json(apps, apks):
gotcurrentver = True gotcurrentver = True
apklist.append(apk) apklist.append(apk)
validapks = 0 validapks = 0
if app.get('Disabled'):
output['disabled'].append(appid)
else:
for build in app.get('Builds', []): for build in app.get('Builds', []):
if not build.get('disable'): if not build.get('disable'):
builtit = False builtit = False
@ -181,8 +184,6 @@ def status_update_json(apps, apks):
failedBuilds[appid].append(build.versionCode) failedBuilds[appid].append(build.versionCode)
if validapks == 0: if validapks == 0:
output['noPackages'].append(appid) output['noPackages'].append(appid)
if app.get('Disabled'):
output['disabled'].append(appid)
if not gotcurrentver: if not gotcurrentver:
output['needsUpdate'].append(appid) output['needsUpdate'].append(appid)
if app.get('UpdateCheckMode') == 'None' and not app.get('Disabled'): if app.get('UpdateCheckMode') == 'None' and not app.get('Disabled'):