From: Daniel Martí Date: Sat, 21 Sep 2013 17:43:31 +0000 (+0200) Subject: Fix many cases of UCM for Gradle X-Git-Tag: 0.1~395 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e3682bd5a8fa0d494a8c1348a805ecf875027236;p=fdroidserver.git Fix many cases of UCM for Gradle --- diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 98f837cd..fff68867 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -937,9 +937,9 @@ def parse_androidmanifests(paths): vnsearch = re.compile(r'.*android:versionName="([^"]+?)".*').search psearch = re.compile(r'.*package="([^"]+)".*').search - vcsearch_g = re.compile(r'.*versionCode[ ]+?([0-9]+?).*').search - vnsearch_g = re.compile(r'.*versionName[ ]+?"([^"]+?)".*').search - psearch_g = re.compile(r'.*packageName[ ]+?"([^"]+)".*').search + vcsearch_g = re.compile(r'.*versionCode[ =]*([0-9]+?).*').search + vnsearch_g = re.compile(r'.*versionName[ =]*"([^"]+?)".*').search + psearch_g = re.compile(r'.*packageName[ =]*"([^"]+)".*').search max_version = None max_vercode = None