From 1e7d9b854d7a036e59ed6c1f2993f13f41ff5852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael.poehn@fsfe.org>
Date: Thu, 2 Aug 2018 17:31:58 +0200
Subject: [PATCH 1/2] never interpret "disable" as bool in yaml metadata

---
 .gitignore               | 3 +++
 fdroidserver/metadata.py | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

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/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':

From 14730be81239d90020cf8140c9d3d1642c70b593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael.poehn@fsfe.org>
Date: Thu, 2 Aug 2018 18:18:07 +0200
Subject: [PATCH 2/2] bump RELEASE_COMMIT_ID for fixing metadata_v0 test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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