From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 10 Sep 2010 07:26:25 +0000 (-0700)
Subject: Make ebuild-ipc.py suppress IOError just like it does for EOFError
X-Git-Tag: v2.2_rc79~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f9cfa125af3ec50f22a89cf6c63827e30861270;p=portage.git

Make ebuild-ipc.py suppress IOError just like it does for EOFError
when the buffer is non-empty.
---

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index 21e5647f3..59ff735c9 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -88,11 +88,9 @@ class EbuildIpc(object):
 		buf = array.array('B')
 		try:
 			buf.fromfile(input_file, self._BUFSIZE)
-		except EOFError as e:
+		except (EOFError, IOError) as e:
 			if not buf:
 				portage.util.writemsg("%s\n" % (e,), noiselevel=-1)
-		except IOError as e:
-			portage.util.writemsg("%s\n" % (e,), noiselevel=-1)
 
 		rval = 2