From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 12 Jun 2013 10:05:55 +0000 (+0200)
Subject: real name can't be None
X-Git-Tag: 0.1~537
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ed6473767891038787d0e94a7bf3e187fdf6621d;p=fdroidserver.git

real name can't be None
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 73777c45..9eb9e9e2 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -885,9 +885,12 @@ def fetch_real_name(app_dir):
                 matches = string_search(line)
                 if matches:
                     name2 = matches.group(1)
-        return name2
+        if name2 is not None:
+            return name2
 
-    return name
+    if name is not None:
+        return name
+    return ''
 
 # Extract some information from the AndroidManifest.xml at the given path.
 # Returns (version, vercode, package), any or all of which might be None.