From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 14 Jun 2013 08:06:22 +0000 (+0200)
Subject: Only match label of the first application element
X-Git-Tag: 0.1~535^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d1ef217895b52b09919a9419bde67b9ae4b90101;p=fdroidserver.git

Only match label of the first application element
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c14e766a..35d2551f 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -864,14 +864,20 @@ def description_html(lines,linkres):
 
 # Retrieve the package name
 def fetch_real_name(app_dir):
+    app_search = re.compile(r'.*<application.*').search
     name_search = re.compile(r'.*android:label="([^"]+)".*').search
+    app_found = False
     name = None
     for line in file(os.path.join(app_dir, 'AndroidManifest.xml')):
-        if name is not None:
-            break
-        matches = name_search(line)
-        if matches:
-            name = matches.group(1)
+        if not app_found:
+            if app_search(line):
+                app_found = True
+        else:
+            if name is not None:
+                break
+            matches = name_search(line)
+            if matches:
+                name = matches.group(1)
 
     if name.startswith('@string/'):
         id = name[8:]