From 979dc7840d2a568b6e99d4d1661d84b4cea10206 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Wed, 15 May 2013 17:08:17 +0200 Subject: [PATCH] Use non-greedy version matches --- fdroidserver/common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.30.2