diff --git a/.gitignore b/.gitignore index d2c5d678..1a77c018 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ pylint.parseable /.testfiles/ README.rst +# editor tmp files +.*.swp + # files generated by tests tmp/ /tests/repo/icons* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e1d6947..71568d71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ test: metadata_v0: image: registry.gitlab.com/fdroid/ci-images-server:latest variables: - RELEASE_COMMIT_ID: b03c4a7353541b73b946e3aebb1585b0d20d2ccc # 1.1a~ + RELEASE_COMMIT_ID: 1e7d9b854d7a036e59ed6c1f2993f13f41ff5852 # 1.1a~ script: - git fetch https://gitlab.com/fdroid/fdroidserver $RELEASE_COMMIT_ID - cd tests diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 813a6ea4..378fdeb8 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -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':