chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1955e2f
)
Merge branch 'local_metadata' into 'master'
author
Michael Pöhn
<uniq@h4x.at>
Tue, 22 Aug 2017 16:46:07 +0000
(16:46 +0000)
committer
Michael Pöhn
<uniq@h4x.at>
Tue, 22 Aug 2017 16:46:07 +0000
(16:46 +0000)
metadata: also read .fdroid.txt metadata
Closes #364
See merge request !319
fdroidserver/metadata.py
patch
|
blob
|
history
diff --git
a/fdroidserver/metadata.py
b/fdroidserver/metadata.py
index 739e964a83c9f6220580c876e230432aa7d6b8cb..25e0537705411cd6c7fdb18f52e19344d0e46db3 100644
(file)
--- a/
fdroidserver/metadata.py
+++ b/
fdroidserver/metadata.py
@@
-728,6
+728,7
@@
def read_metadata(xref=True, check_vcs=[]):
for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.txt'))
+ glob.glob(os.path.join('metadata', '*.json'))
+ glob.glob(os.path.join('metadata', '*.yml'))
+ + glob.glob('.fdroid.txt')
+ glob.glob('.fdroid.json')
+ glob.glob('.fdroid.yml')):
packageName, _ = fdroidserver.common.get_extension(os.path.basename(metadatapath))