From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 6 Mar 2013 18:20:52 +0000 (+0000)
Subject: Merge commit 'refs/merge-requests/112' of git://gitorious.org/f-droid/fdroidserver... 
X-Git-Tag: 0.1~683
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=81c3710f577aa3934b7f1515ebb9daaae40f4123;p=fdroidserver.git

Merge commit 'refs/merge-requests/112' of git://gitorious.org/f-droid/fdroidserver into merge-requests/112

Conflicts:
	fdroidserver/build.py
---

81c3710f577aa3934b7f1515ebb9daaae40f4123
diff --cc fdroidserver/build.py
index 03b519a7,bc7d6b4e..2d9e736b
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -354,8 -352,8 +354,8 @@@ def build_local(app, thisbuild, vcs, bu
              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_\]",
 -            # This format is found in com.yubico.yubitotp for example...
++            # This format is found in com.yubico.yubitotp and com.botbrew.basil for example...
+             m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^$]+)\.ap_,",
                      output, re.S|re.M)
          if not m:
              print output