From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 21 Sep 2010 01:43:10 +0000 (-0700)
Subject: Make ebuild-ipc kill the child IO process before it exits due to timeout.
X-Git-Tag: v2.2_rc86~13
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8603b29c85a480e24d46e7b4bd94fab7c83ce4b2;p=portage.git

Make ebuild-ipc kill the child IO process before it exits due to timeout.
---

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index 9f6157dda..af152e11e 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -112,6 +112,13 @@ class EbuildIpc(object):
 					self._timeout_retry_msg(start_time, msg)
 				else:
 					self._no_daemon_msg()
+					try:
+						os.kill(pid, signal.SIGKILL)
+						os.wait()
+					except OSError as e:
+						portage.util.writemsg_level(
+							"ebuild-ipc: %s\n" % (e,),
+							level=logging.ERROR, noiselevel=-1)
 					return 2
 
 		if not os.WIFEXITED(wait_retval[1]):
@@ -200,7 +207,7 @@ class EbuildIpc(object):
 			portage.util.writemsg_level(
 				"ebuild-ipc: %s: %s\n" % (msg,
 				portage.localization._('subprocess failure: %s') % \
-				wait_retval[1]), level=logging.ERROR, noiselevel=-1)
+				retval), level=logging.ERROR, noiselevel=-1)
 			return retval
 
 		if not self._daemon_is_alive():