From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 15 May 2013 15:08:17 +0000 (+0200)
Subject: Use non-greedy version matches
X-Git-Tag: 0.1~608
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=979dc7840d2a568b6e99d4d1661d84b4cea10206;p=fdroidserver.git

Use non-greedy version matches
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e9982c39..f9b91bbb 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -839,10 +839,10 @@ def description_html(lines,linkres):
 # All values returned are strings.
 def parse_androidmanifest(app_dir):
 
-    vcsearch = re.compile(r'.*android:versionCode="([0-9]+)".*').search
-    vnsearch = re.compile(r'.*android:versionName="([^@]+)".*').search
+    vcsearch = re.compile(r'.*android:versionCode="([0-9]+?)".*').search
+    vnsearch = re.compile(r'.*android:versionName="([^@]+?)".*').search
     psearch = re.compile(r'.*package="([^"]+)".*').search
-    vnsearch_xml = re.compile(r'.*"(app_|)version">([^<]+)<.*').search
+    vnsearch_xml = re.compile(r'.*"(app_|)version">([^<]+?)<.*').search
     version = None
     vercode = None
     package = None