chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a452cdb
)
real name can't be None
author
Daniel Martí
<mvdan@mvdan.cc>
Wed, 12 Jun 2013 10:05:55 +0000
(12:05 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Wed, 12 Jun 2013 10:05:55 +0000
(12:05 +0200)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 73777c45ed731dd08adbf5a017264eaf254808d2..9eb9e9e299a61fc3814b033f7c415949e43214b4 100644
(file)
--- 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.