diff options
author | Pekka Lampila <pekka.lampila@iki.fi> | 2014-02-18 05:03:59 +0200 |
---|---|---|
committer | Pekka Lampila <pekka.lampila@iki.fi> | 2014-02-18 05:14:28 +0200 |
commit | deceb63ae733ef02571b3cf085c1877d90eac1a9 (patch) | |
tree | 373a8b250bd94c2575bd42e7db870d7dea1a7b64 /crawl-ref/source/webserver | |
parent | 4b556a2e6122e463f14adaf92f4ca68e09626665 (diff) | |
download | crawl-ref-deceb63ae733ef02571b3cf085c1877d90eac1a9.tar.gz crawl-ref-deceb63ae733ef02571b3cf085c1877d90eac1a9.zip |
Fix reading -print-webtiles-options output.
Unread output wasn't checked for after returncode was received.
Diffstat (limited to 'crawl-ref/source/webserver')
-rw-r--r-- | crawl-ref/source/webserver/checkoutput.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/webserver/checkoutput.py b/crawl-ref/source/webserver/checkoutput.py index 9bbf8f2630..7131ca8360 100644 --- a/crawl-ref/source/webserver/checkoutput.py +++ b/crawl-ref/source/webserver/checkoutput.py @@ -25,8 +25,14 @@ def check_output(call, callback, ioloop): if p.returncode is not None: ioloop.remove_handler(out_r) + try: + buf = os.read(out_r, BUFSIZ) + except (IOError, OSError) as e: + pass os.close(out_r) + if buf: + data.append(buf) callback("".join(data), p.returncode) def _handle_read(fd, events): |