aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-08-03 03:37:02 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-08-03 03:37:02 +0200
commit5426e509c7053f75746bbb6ce0673e0663e4e98a (patch)
tree401e52897680de0c690ba51c94a06d5c9d18e855 /pym/_emerge
parent* Make _world_repo_match() try to match both atoms, so it still works (diff)
downloadportage-5426e509c7053f75746bbb6ce0673e0663e4e98a.tar.gz
portage-5426e509c7053f75746bbb6ce0673e0663e4e98a.tar.bz2
portage-5426e509c7053f75746bbb6ce0673e0663e4e98a.zip
Bug #330937: Handle IOError raised by array.fromfile().
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/SpawnProcess.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index a4a6d87ee..bacbc2f30 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -148,7 +148,8 @@ class SpawnProcess(SubProcess):
buf = array.array('B')
try:
buf.fromfile(files.process, self._bufsize)
- except EOFError:
+ # EOFError was raised in Python <2.6.6 and <2.7.1.
+ except (EOFError, IOError):
pass
if buf: