From 15e1a041ddd6bdbc6dc30b350e16c864f8d4c334 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 12 Aug 2010 22:08:56 -0700 Subject: Make IpcDaemonTestCase demonstrate an EbuildIpcDaemon based replacement for EBUILD_EXIT_STATUS_FILE. --- bin/ebuild-ipc.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'bin/ebuild-ipc.py') diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index 2edd66559..761e07a2a 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -51,18 +51,17 @@ class EbuildIpc(object): output_file.flush() events = select.select([input_file], [], []) - if input_file in events[0]: - reply = pickle.load(input_file) - else: - reply = None - + reply = pickle.load(input_file) output_file.close() input_file.close() - if reply == 'OK': - rval = os.EX_OK - else: - rval = 1 + (out, err, rval) = reply + + if out: + portage.util.writemsg_stdout(out, noiselevel=-1) + + if err: + portage.util.writemsg(out, noiselevel=-1) return rval -- cgit v1.2.3-1-g7c22