kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-13 02:30:11 +01:00
Code Activity

Recognise build output with space in filename (and show full output in verbose mode)

Browse Source
This commit is contained in:
Ciaran Gultnieks 2012-04-05 23:35:39 +01:00
parent 95575ede22
commit fda3e85c3a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/build.py
View File

@ -183,6 +183,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
output, error = p.communicate()
if p.returncode != 0:
raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip())
if verbose:
print output
if install:
return
print "Build successful"
@ -203,7 +205,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
src = os.path.join(bindir, src) + '.apk'
#[INFO] Installing /home/ciaran/fdroidserver/tmp/mainline/application/target/callerid-1.0-SNAPSHOT.apk
else:
src = re.match(r".*^.*Creating (\S+) for release.*$.*", output,
src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
re.S|re.M).group(1)
src = os.path.join(bindir, src)