Version names can contain any character

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f55fbf3dccd8b28378015a70ce438aa773dc9d07..8791842b5faa9b618fa6c52694d288f87ad795fa 100644 (file)
--- 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