From 13e760ece6fafee530e3691618ae65df0ef2f854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 14 May 2013 21:23:36 +0200 Subject: [PATCH] Version names can contain any character --- fdroidserver/common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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