Bug #230579 - Handle EOFError raised from cPickle.load() in

PreservedLibsRegistry.load().

svn path=/main/trunk/; revision=10915

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 095d299012c4710a4483f1f12079997ca04bf0e2..f2761d63f6fa252cceef0f17fe9e5aaf00ab7ba7 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -52,8 +52,8 @@ class PreservedLibsRegistry(object):
                """ Reload the registry data from file """
                try:
                        self._data = cPickle.load(open(self._filename, "r"))
-               except IOError, e:
-                       if e.errno == errno.ENOENT:
+               except (EOFError, IOError), e:
+                       if isintance(e, EOFError) or e.errno == errno.ENOENT:
                                self._data = {}
                        elif e.errno == PermissionDenied.errno:
                                raise PermissionDenied(self._filename)