From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 4 Jan 2013 07:14:07 +0000 (-0800)
Subject: ebuild-ipc: fix waiting message
X-Git-Tag: v2.2.0_alpha150~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6eff7ea1d28da8af9a30a5b8c1dcd05ed9b7638d;p=portage.git

ebuild-ipc: fix waiting message

It got disabled by commit 439151bb5b0bd2ac4c9d2dd218fe377ce0b988e6.
---

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index ceab4d579..ca707fa98 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -46,7 +46,7 @@ class EbuildIpc(object):
 
 	# Timeout for each individual communication attempt (we retry
 	# as long as the daemon process appears to be alive).
-	_COMMUNICATE_RETRY_TIMEOUT_SECONDS = 15
+	_COMMUNICATE_RETRY_TIMEOUT_MS = 15000
 
 	def __init__(self):
 		self.fifo_dir = os.environ['PORTAGE_BUILDDIR']
@@ -106,7 +106,7 @@ class EbuildIpc(object):
 		eof = pipe_reader.poll() is not None
 
 		while not eof:
-			pipe_reader.scheduler.iteration()
+			pipe_reader._wait_loop(timeout=self._COMMUNICATE_RETRY_TIMEOUT_MS)
 
 			eof = pipe_reader.poll() is not None
 			if eof: