chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5214889
)
metadata: port .fdroid.yml handling to App dict subclass
author
Hans-Christoph Steiner
<hans@eds.org>
Tue, 28 Feb 2017 09:37:09 +0000
(10:37 +0100)
committer
Hans-Christoph Steiner
<hans@eds.org>
Tue, 28 Feb 2017 11:08:04 +0000
(12:08 +0100)
This got overlooked in
b7fc7f2228986d0210e221c9ec8ddcc2ad9b93bc
, then
caught in the ./makebuildserver tests, where it builds Checkey.
fdroidserver/metadata.py
patch
|
blob
|
history
diff --git
a/fdroidserver/metadata.py
b/fdroidserver/metadata.py
index 31128c4125506e1f27e8a2da7f6fcc2f9567e6f2..efd16fc9a78eb1eed960468544c8a172a54e8c3f 100644
(file)
--- 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)