mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-07 16:00:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '530-lint-issue-with-disable' into 'master'

Browse source 
Resolve "Lint issues with 'disable: ...` in YAML"

Closes #530

See merge request fdroid/fdroidserver!550
This commit is contained in:
Hans-Christoph Steiner 2018-08-03 09:07:09 +00:00
commit a01d11ba64
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/metadata.py
View file

@ -249,7 +249,7 @@ class Build(dict):
def __init__(self, copydict=None):
super().__init__()
self.disable = False
self.disable = ''
self.commit = None
self.timeout = None
self.subdir = None
@ -874,7 +874,7 @@ def post_metadata_parse(app):
elif v == [False]:
return ['no']
_bool_allowed = ('disable', 'maven', 'buildozer')
_bool_allowed = ('maven', 'buildozer')
builds = []
if 'builds' in app:
@ -1118,7 +1118,7 @@ def write_yaml(mf, app):
value = getattr(build, field)
if field == 'gradle' and value == ['off']:
value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')]
if field in ('disable', 'maven', 'buildozer'):
if field in ('maven', 'buildozer'):
if value == 'no':
continue
elif value == 'yes':