mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	fdroidserver/build.py
This commit is contained in:
Ciaran Gultnieks 2013-03-06 18:20:52 +00:00
commit 81c3710f57
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/build.py
View file

@ -354,8 +354,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/app/target/([^$]+)\.ap_\]", m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/app/target/([^$]+)\.ap_\]",
output, re.S|re.M) output, re.S|re.M)
if not m: if not m:
# This format is found in com.botbrew.basil 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'] + "/target/([^$]+)\.ap_\]", m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^$]+)\.ap_,",
output, re.S|re.M) output, re.S|re.M)
if not m: if not m:
print output print output