From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 14 Aug 2010 04:53:39 +0000 (-0700)
Subject: Add back the POLLHUP handling for now since PipeReaderTestCase breaks
X-Git-Tag: v2.2_rc68~226
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3e9c36fd8d199bb5ecbbfa3eb50e451bafd8b86;p=portage.git

Add back the POLLHUP handling for now since PipeReaderTestCase breaks
without it.
---

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index b654a615f..1feee15f6 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -10,7 +10,7 @@ class AbstractPollTask(AsynchronousTask):
 
 	_bufsize = 4096
 	_exceptional_events = PollConstants.POLLERR | PollConstants.POLLNVAL
-	_registered_events = PollConstants.POLLIN | \
+	_registered_events = PollConstants.POLLIN | PollConstants.POLLHUP | \
 		_exceptional_events
 
 	def _unregister(self):
@@ -21,3 +21,7 @@ class AbstractPollTask(AsynchronousTask):
 			if event & self._exceptional_events:
 				self._unregister()
 				self.cancel()
+			elif event & PollConstants.POLLHUP:
+				self._unregister()
+				self.wait()
+