From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 11 Jan 2014 12:33:17 +0000 (+0100)
Subject: Fix gradle checkupdates for some more cases
X-Git-Tag: 0.1~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7c461db59688ccf54bc8d69cf3f92f0026d37cca;p=fdroidserver.git

Fix gradle checkupdates for some more cases

* If there are no equal signs
* If the vercode is not quoted
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e28c4669..ac4cc5ea 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -683,9 +683,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]+?)[^\d].*').search
-    vnsearch_g = re.compile(r'.*versionName[ ]*=[ ]*(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
-    psearch_g = re.compile(r'.*packageName[ ]*=[ ]*["\']([^"]+)["\'].*').search
+    vcsearch_g = re.compile(r'.*versionCode[ ]*[=]*[ ]*["\']*([0-9]+)["\']*').search
+    vnsearch_g = re.compile(r'.*versionName[ ]*[=]*[ ]*(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
+    psearch_g = re.compile(r'.*packageName[ ]*[=]*[ ]*["\']([^"]+)["\'].*').search
 
     max_version = None
     max_vercode = None