Merge branch 'metadata' into 'master'

--create-metadata: make sure apk[name] is not empty

See merge request !302

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 1349fbcfc81fc920e52d2cb389723736b95fbf1d..7754ae4ba27cf76cf880be70985197ef18432125 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1767,7 +1767,7 @@ def main():
                     # special tricks are not really needed here, this
                     # uses the plain YAML lib
                     app = dict()
-                    if 'name' in apk:
+                    if 'name' in apk and apk['name'] != '':
                         app['Name'] = apk['name']
                     else:
                         logging.warning(apk['packageName'] + ' does not have a name! Using package name instead.')