kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-15 10:50:09 +02:00
Code Activity

Merge branch 'disabled_needsupdated' into 'master'

Browse Source 
[status_json] Don't list disabled builds as needs updated

Closes #898

See merge request fdroid/fdroidserver!917
This commit is contained in:
Hans-Christoph Steiner 2021-05-13 12:42:46 +00:00
commit a1dfd69392
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fdroidserver/update.py
View File

@ -140,6 +140,7 @@ def status_update_json(apps, apks):
output = common.setup_status_output(start_timestamp)
output['antiFeatures'] = dict()
output['disabled'] = []
output['archivePolicy0'] = []
output['failedBuilds'] = dict()
output['noPackages'] = []
output['needsUpdate'] = []
@ -168,6 +169,8 @@ def status_update_json(apps, apks):
validapks = 0
if app.get('Disabled'):
output['disabled'].append(appid)
elif app.get("ArchivePolicy") and int(app["ArchivePolicy"][:-9]) == 0:
output['archivePolicy0'].append(appid)
else:
for build in app.get('Builds', []):
if not build.get('disable'):
@ -182,12 +185,12 @@ def status_update_json(apps, apks):
if appid not in failedBuilds:
failedBuilds[appid] = []
failedBuilds[appid].append(build.versionCode)
if validapks == 0:
output['noPackages'].append(appid)
if not gotcurrentver:
output['needsUpdate'].append(appid)
if app.get('UpdateCheckMode') == 'None' and not app.get('Disabled'):
output['noUpdateCheck'].append(appid)
if validapks == 0:
output['noPackages'].append(appid)
if not gotcurrentver:
output['needsUpdate'].append(appid)
if app.get('UpdateCheckMode') == 'None':
output['noUpdateCheck'].append(appid)
common.write_status_json(output, options.pretty)