From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 28 Feb 2017 09:37:09 +0000 (+0100)
Subject: metadata: port .fdroid.yml handling to App dict subclass
X-Git-Tag: 0.8~116^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4e8e29794482741721583ff428202235be7c7115;p=fdroidserver.git

metadata: port .fdroid.yml handling to App dict subclass

This got overlooked in b7fc7f2228986d0210e221c9ec8ddcc2ad9b93bc, then
caught in the ./makebuildserver tests, where it builds Checkey.
---

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 31128c41..efd16fc9 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -912,10 +912,10 @@ def parse_metadata(metadatapath, check_vcs=False):
         if os.path.isfile(metadata_in_repo):
             logging.debug('Including metadata from ' + metadata_in_repo)
             # do not include fields already provided by main metadata file
-            app_in_repo = parse_metadata(metadata_in_repo).field_dict()
+            app_in_repo = parse_metadata(metadata_in_repo)
             for k, v in app_in_repo.items():
-                if k not in app.field_dict():
-                    app.set_field(k, v)
+                if k not in app:
+                    app[k] = v
 
     post_metadata_parse(app)