From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 14 May 2013 19:23:36 +0000 (+0200)
Subject: Version names can contain any character
X-Git-Tag: 0.1~614
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=13e760ece6fafee530e3691618ae65df0ef2f854;p=fdroidserver.git

Version names can contain any character
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f55fbf3d..8791842b 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="([^"]+)".*').search
-    vnsearch = re.compile(r'.*android:versionName="([\.0-9a-zA-Z]+)".*').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">([\.0-9a-zA-Z]+)<.*').search
+    vnsearch_xml = re.compile(r'.*"app_version">([^<]+)<.*').search
     version = None
     vercode = None
     package = None