From 55e3fc9aa36545c482ae9c5dde4c661efc4a8118 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Fri, 8 Nov 2013 18:56:28 +0100 Subject: [PATCH] Fix maven apk finding method --- fdroidserver/build.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 3ed66708..10d3d286 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -555,15 +555,14 @@ 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 'apk' in line]) + 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: m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk[^l]", stdout_apk, re.S|re.M) if not m: - # This format is found in com.github.mobile, com.yubico.yubitotp and com.botbrew.basil for example... - m = re.match(r'.*^\[INFO\] [^$]*aapt \[package,[^$]*' + bindir + '/([^/]+)\.ap[_k][,\]]', + m = re.match(r'.*^\[INFO\] [^$]*aapt \[package,[^$]*' + bindir + r'/([^/]+)\.ap[_k][,\]]', stdout_apk, re.S|re.M) if not m: raise BuildException('Failed to find output') -- 2.30.2