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

Ensure end of buildserver output is always captured

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-11-13 18:45:37 +00:00
parent 17f6e4d169
commit cd8bd62e0b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/build.py
View file

@ -332,10 +332,16 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
error += chan.recv_stderr(1024) error += chan.recv_stderr(1024)
print "...getting exit status" print "...getting exit status"
returncode = chan.recv_exit_status() returncode = chan.recv_exit_status()
while chan.recv_ready(): while True:
output += chan.recv(1024) get = chan.recv(1024)
while chan.recv_stderr_ready(): if len(get) == 0:
error += chan.recv_stderr(1024) break
output += get
while True:
get = chan.recv_stderr(1024)
if len(get) == 0:
break
error += get
if returncode != 0: if returncode != 0:
raise BuildException("Build.py failed on server for %s:%s" % (app['id'], thisbuild['version']), output, error) raise BuildException("Build.py failed on server for %s:%s" % (app['id'], thisbuild['version']), output, error)