From 5e1b07dce33e0b2fb0b2717f88ab8ae96793c504 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 18 Nov 2015 15:33:30 -0800
Subject: [PATCH] import: don't crash due to missing id

Fixes #129
---
 fdroidserver/common.py | 2 +-
 fdroidserver/import.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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
-- 
2.30.2