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

Avoid crashes on package: group() calls

Browse source
This commit is contained in:
Daniel Martí 2014-01-08 09:00:40 +01:00
parent 334a221893
commit 8cb00b289f
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/build.py
View file

@ -690,11 +690,18 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
for line in output.splitlines(): for line in output.splitlines():
if line.startswith("package:"): if line.startswith("package:"):
pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*") pat = re.compile(".*name='([a-zA-Z0-9._]*)'.*")
foundid = re.match(pat, line).group(1) m = pat.match(line)
if m:
foundid = m.group(1)
pat = re.compile(".*versionCode='([0-9]*)'.*") pat = re.compile(".*versionCode='([0-9]*)'.*")
vercode = re.match(pat, line).group(1) m = pat.match(line)
if m:
vercode = m.group(1)
pat = re.compile(".*versionName='([^']*)'.*") pat = re.compile(".*versionName='([^']*)'.*")
version = re.match(pat, line).group(1) m = pat.match(line)
if m:
version = m.group(1)
if thisbuild['novcheck']: if thisbuild['novcheck']:
vercode = thisbuild['vercode'] vercode = thisbuild['vercode']
version = thisbuild['version'] version = thisbuild['version']