mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use non-greedy version matches

Browse source
This commit is contained in:
Daniel Martí 2013-05-15 17:08:17 +02:00
parent 73922c881d
commit 979dc7840d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -839,10 +839,10 @@ def description_html(lines,linkres):
# All values returned are strings. # All values returned are strings.
def parse_androidmanifest(app_dir): def parse_androidmanifest(app_dir):
vcsearch = re.compile(r'.*android:versionCode="([0-9]+)".*').search vcsearch = re.compile(r'.*android:versionCode="([0-9]+?)".*').search
vnsearch = re.compile(r'.*android:versionName="([^@]+)".*').search vnsearch = re.compile(r'.*android:versionName="([^@]+?)".*').search
psearch = re.compile(r'.*package="([^"]+)".*').search psearch = re.compile(r'.*package="([^"]+)".*').search
vnsearch_xml = re.compile(r'.*"(app_|)version">([^<]+)<.*').search vnsearch_xml = re.compile(r'.*"(app_|)version">([^<]+?)<.*').search
version = None version = None
vercode = None vercode = None
package = None package = None