Extra maven target matching

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 1a2aa293f5e190090969f573e5d2b76a0d1a34cd..03b519a79da823c13d0cd6933a686e8b9f2bd978 100644 (file)
--- 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')