From deceb63ae733ef02571b3cf085c1877d90eac1a9 Mon Sep 17 00:00:00 2001 From: Pekka Lampila Date: Tue, 18 Feb 2014 05:03:59 +0200 Subject: Fix reading -print-webtiles-options output. Unread output wasn't checked for after returncode was received. --- crawl-ref/source/webserver/checkoutput.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'crawl-ref/source/webserver') 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): -- cgit v1.2.3-54-g00ecf