From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 6 Oct 2010 21:53:57 +0000 (-0700)
Subject: Bug #339976 - Suppress fifo POLLHUP events.
X-Git-Tag: v2.2_rc91~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d08d8da197798a45c423dd0cf54c63a2badcb317;p=portage.git

Bug #339976 - Suppress fifo POLLHUP events.
---

diff --git a/pym/_emerge/EbuildIpcDaemon.py b/pym/_emerge/EbuildIpcDaemon.py
index 0c8ea3ea8..e6ee82b1e 100644
--- a/pym/_emerge/EbuildIpcDaemon.py
+++ b/pym/_emerge/EbuildIpcDaemon.py
@@ -55,6 +55,17 @@ class EbuildIpcDaemon(FifoIpcDaemon):
 				# any exception when given corrupt data.
 				pass
 			else:
+
+				# Re-open the input stream, in order to suppress
+				# POLLHUP events (bug #339976).
+				self._files.pipe_in.close()
+				input_fd = os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK)
+				self._files.pipe_in = os.fdopen(input_fd, 'rb', 0)
+				self.scheduler.unregister(self._reg_id)
+				self._reg_id = self.scheduler.register(
+					self._files.pipe_in.fileno(),
+					self._registered_events, self._input_handler)
+
 				cmd_key = obj[0]
 				cmd_handler = self.commands[cmd_key]
 				reply = cmd_handler(obj)