opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This got overlooked in b7fc7f2228, then
caught in the ./makebuildserver tests, where it builds Checkey.
This commit is contained in:
Hans-Christoph Steiner 2017-02-28 10:37:09 +01:00
parent 5214889bbd
commit 4e8e297944
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/metadata.py
View File

@ -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)