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

never interpret "disable" as bool in yaml metadata

Browse source
This commit is contained in:
Michael Pöhn 2018-08-02 17:31:58 +02:00
parent 545872f184
commit 1e7d9b854d
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -16,6 +16,9 @@ pylint.parseable
/.testfiles/ /.testfiles/
README.rst README.rst
# editor tmp files
.*.swp
# files generated by tests # files generated by tests
tmp/ tmp/
/tests/repo/icons* /tests/repo/icons*

6
fdroidserver/metadata.py
View file

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