[gentoo-commits] proj/portage:master commit in: pym/_emerge/

["Zac Medico" <zmedico@gentoo.org>]

commit:     36632047bebbd435610944ad9e7850163b260645
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 18:58:35 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 18:58:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=36632047

Fix EIO handling for PollSelectAdapter.

In PipeReader and AbstractPollTask, we have to treat EIO as EOF, in
order to terminate the select loop at the correct time when using
PollSelectAdapter. This fixes a regression in EIO handling since
commits 915348ce34fc499ac295b8f0ffee9f0829803542 adn
30d2d0a9db486c5a70848ad5d27b37a3ec48f271.

---
 pym/_emerge/AbstractPollTask.py |    9 +++++++--
 pym/_emerge/PipeReader.py       |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index ea13587..d4785a2 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -50,9 +50,14 @@ class AbstractPollTask(AsynchronousTask):
 			except OSError as e:
 				# EIO happens with pty on Linux after the
 				# slave end of the pty has been closed.
-				if e.errno not in (errno.EAGAIN, errno.EIO):
+				if e.errno == errno.EIO:
+					# EOF: return empty buffer
+					pass
+				elif e.errno == errno.EAGAIN:
+					# EAGAIN: return None
+					buf = None
+				else:
 					raise
-				buf = None
 
 		return buf
 

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 78acb72..a465c2a 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -66,9 +66,14 @@ class PipeReader(AbstractPollTask):
 				except OSError as e:
 					# EIO happens with pty on Linux after the
 					# slave end of the pty has been closed.
-					if e.errno not in (errno.EAGAIN, errno.EIO):
+					if e.errno == errno.EIO:
+						self._unregister()
+						self.wait()
+						break
+					elif e.errno == errno.EAGAIN:
+						break
+					else:
 						raise
-					break
 				else:
 					if data:
 						self._read_data.append(data)