From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 18 Nov 2015 23:33:30 +0000 (-0800)
Subject: import: don't crash due to missing id
X-Git-Tag: 0.6.0~103
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5e1b07dce33e0b2fb0b2717f88ab8ae96793c504;p=fdroidserver.git

import: don't crash due to missing id

Fixes #129
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 8e0e651f..d7260839 100644
--- 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 bac63251..3256aaef 100644
--- 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