From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 6 Mar 2013 18:16:43 +0000 (+0000)
Subject: Extra maven target matching
X-Git-Tag: 0.1~684
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=242707602b5359a2687227cbc7ced5776d78e6f1;p=fdroidserver.git

Extra maven target matching
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 1a2aa293..03b519a7 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -353,6 +353,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.botbrew.basil for example...
+            m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/target/([^$]+)\.ap_\]",
+                    output, re.S|re.M)
         if not m:
             print output
             raise BuildException('Failed to find output')