From 72151355b102ef3d4922d4a38b16abff6854912c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Fri, 8 Nov 2013 19:03:23 +0100 Subject: [PATCH] Look for '.apk', not just 'apk', for ant/maven outputs --- fdroidserver/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 10d3d286..3c0343ad 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -555,7 +555,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d bindir = os.path.join(root_dir, 'bin') if 'maven' in thisbuild: stdout_apk = '\n'.join([ - line for line in p.stdout.splitlines() if any(a in line for a in ('apk','ap_'))]) + line for line in p.stdout.splitlines() if any(a in line for a in ('.apk','.ap_'))]) m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk", stdout_apk, re.S|re.M) if not m: @@ -579,7 +579,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d src = os.path.join(dd, 'build', 'apk', name+'.apk') else: stdout_apk = '\n'.join([ - line for line in p.stdout.splitlines() if 'apk' in line]) + line for line in p.stdout.splitlines() if '.apk' in line]) src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk, re.S|re.M).group(1) src = os.path.join(bindir, src) -- 2.30.2