From 7e9d46d427f49df4f373c004e1f00f72fa72c6d2 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 5 Mar 2013 13:36:15 +0100
Subject: [PATCH] Discover apk filename from maven builds.

---
 fdroidserver/build.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index bfe35446..bc7d6b4e 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -351,6 +351,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
             # This format is found in com.github.mobile for example...
             m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/app/target/([^$]+)\.ap_\]",
                     output, re.S|re.M)
+        if not m:
+            # This format is found in com.yubico.yubitotp for example...
+            m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^$]+)\.ap_,",
+                    output, re.S|re.M)
         if not m:
             print output
             raise BuildException('Failed to find output')