From b78b56d7821cc30c904ee2dd5af57973b9622215 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 12 Dec 2012 17:17:36 +0100 Subject: [PATCH] Update for an Issue #287 regarding read_output returning values --- lib/utils/xmlrpc.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/utils/xmlrpc.py b/lib/utils/xmlrpc.py index 2b81beebc..de895b06a 100644 --- a/lib/utils/xmlrpc.py +++ b/lib/utils/xmlrpc.py @@ -54,14 +54,13 @@ class XMLRPCServer: return kb.get("busyFlag") def read_output(self): - retval = [] - for _ in ("stdout", "stderr"): - stream = getattr(sys, _) - stream.seek(0) - retval.append(stream.read()) - stream.truncate(0) - if not filter(None, retval) and not self.is_busy(): + sys.stdout.seek(0) + retval = sys.stdout.read() + sys.stdout.truncate(0) + + if not retval and not self.is_busy(): retval = None + return retval def run(self):