summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/PipeReader.py
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-08-05 15:02:20 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-08-05 15:02:20 +0200
commiteb863416cde2c7b7a7ab8f70b5bac4b4fc4d8aee (patch)
tree8d7819f2133cbc68f701c7deec9a00ed1cca35f7 /pym/_emerge/PipeReader.py
parent293bd0e85326a22effb5f10d1489014ecc617e59 (diff)
downloadportage-eb863416cde2c7b7a7ab8f70b5bac4b4fc4d8aee.tar.gz
portage-eb863416cde2c7b7a7ab8f70b5bac4b4fc4d8aee.tar.bz2
portage-eb863416cde2c7b7a7ab8f70b5bac4b4fc4d8aee.zip
Bug #330937: Handle IOError raised by remaining calls to array.fromfile().
Diffstat (limited to 'pym/_emerge/PipeReader.py')
-rw-r--r--pym/_emerge/PipeReader.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index be958bcb2..2c3495c37 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -71,7 +71,8 @@ class PipeReader(AbstractPollTask):
buf = array.array('B')
try:
buf.fromfile(f, self._bufsize)
- except EOFError:
+ # EOFError was raised in Python <2.6.6 and <2.7.1.
+ except (EOFError, IOError):
pass
if buf: