import: don't crash due to missing id

Fixes #129

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 8e0e651ff110964a6d0a024d6dc2c799c03ebd1d..d7260839040c3ffab16fcd625ca7e75c8fc1ee64 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1027,7 +1027,7 @@ def app_matches_packagename(app, package):
     if not package:
         return False
     appid = app['Update Check Name'] or app['id']
-    if appid == "Ignore":
+    if appid is None or appid == "Ignore":
         return True
     return appid == package
 

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index bac632518ca4f7624034b7b401779f7aba9c3554..3256aaef2f83119dd2dbc75ecc6d9aa5cb7c709a 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -175,6 +175,7 @@ def main():
 
     apps = metadata.read_metadata()
     package, app = metadata.get_default_app_info_list(apps)
+    app['id'] = None
     app['Update Check Mode'] = "Tags"
 
     root_dir = None