mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Merge branch 'disabled_needsupdated' into 'master'
[status_json] Don't list disabled builds as needs updated Closes #898 See merge request fdroid/fdroidserver!917
This commit is contained in:
commit
a1dfd69392
@ -140,6 +140,7 @@ def status_update_json(apps, apks):
|
|||||||
output = common.setup_status_output(start_timestamp)
|
output = common.setup_status_output(start_timestamp)
|
||||||
output['antiFeatures'] = dict()
|
output['antiFeatures'] = dict()
|
||||||
output['disabled'] = []
|
output['disabled'] = []
|
||||||
|
output['archivePolicy0'] = []
|
||||||
output['failedBuilds'] = dict()
|
output['failedBuilds'] = dict()
|
||||||
output['noPackages'] = []
|
output['noPackages'] = []
|
||||||
output['needsUpdate'] = []
|
output['needsUpdate'] = []
|
||||||
@ -168,6 +169,8 @@ def status_update_json(apps, apks):
|
|||||||
validapks = 0
|
validapks = 0
|
||||||
if app.get('Disabled'):
|
if app.get('Disabled'):
|
||||||
output['disabled'].append(appid)
|
output['disabled'].append(appid)
|
||||||
|
elif app.get("ArchivePolicy") and int(app["ArchivePolicy"][:-9]) == 0:
|
||||||
|
output['archivePolicy0'].append(appid)
|
||||||
else:
|
else:
|
||||||
for build in app.get('Builds', []):
|
for build in app.get('Builds', []):
|
||||||
if not build.get('disable'):
|
if not build.get('disable'):
|
||||||
@ -186,7 +189,7 @@ def status_update_json(apps, apks):
|
|||||||
output['noPackages'].append(appid)
|
output['noPackages'].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':
|
||||||
output['noUpdateCheck'].append(appid)
|
output['noUpdateCheck'].append(appid)
|
||||||
common.write_status_json(output, options.pretty)
|
common.write_status_json(output, options.pretty)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user