diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-03 12:04:58 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-03 12:04:58 -0700 |
| commit | 28d217d88dab85ffe315ef6bc4659d69c4f17095 (patch) | |
| tree | 94d77efb2f5c2a9c7492bbb0e2223f11e71a6879 /pym/portage/util/_dyn_libs | |
| parent | bc636fe8f9720957f29e5a07cd98531f20368ddd (diff) | |
| download | portage-28d217d88dab85ffe315ef6bc4659d69c4f17095.tar.gz portage-28d217d88dab85ffe315ef6bc4659d69c4f17095.tar.bz2 portage-28d217d88dab85ffe315ef6bc4659d69c4f17095.zip | |
Handle unpickle EOFError.
Diffstat (limited to 'pym/portage/util/_dyn_libs')
| -rw-r--r-- | pym/portage/util/_dyn_libs/PreservedLibsRegistry.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py index a1814981d..510c390af 100644 --- a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py +++ b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py @@ -59,12 +59,18 @@ class PreservedLibsRegistry(object): try: f = open(_unicode_encode(self._filename, encoding=_encodings['fs'], errors='strict'), 'rb') - self._data = pickle.load(f) - except (AttributeError, ValueError, pickle.UnpicklingError) as e: + if os.fstat(f.fileno()).st_size == 0: + # ignore empty lock file + pass + else: + self._data = pickle.load(f) + except (AttributeError, EOFError, ValueError, pickle.UnpicklingError) as e: writemsg_level(_("!!! Error loading '%s': %s\n") % \ (self._filename, e), level=logging.ERROR, noiselevel=-1) - except (EOFError, IOError) as e: - if isinstance(e, EOFError) or e.errno == errno.ENOENT: + except EnvironmentError as e: + if not hasattr(e, 'errno'): + raise + elif e.errno == errno.ENOENT: pass elif e.errno == PermissionDenied.errno: raise PermissionDenied(self._filename) |