From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 23 Oct 2013 17:53:07 +0000 (+0200)
Subject: Fix issues with .apklib files being seen as output apks
X-Git-Tag: 0.1~319
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=162c7c40e6fcf89d277ea878355d8cc4cf681d7b;p=fdroidserver.git

Fix issues with .apklib files being seen as output apks
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 0bae7bff..4364f73d 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -562,7 +562,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
                 p.stdout_apk, re.S|re.M)
         if not m:
-            m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
+            m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk[^l]",
                     p.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...