diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-03 11:39:05 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-03 11:39:05 -0700 |
| commit | bc636fe8f9720957f29e5a07cd98531f20368ddd (patch) | |
| tree | 2904f9452090b7019044b1e24e1cc0d56002f579 /pym/_emerge | |
| parent | 3f9239de54cc90972750f673102f88b824e500ba (diff) | |
| download | portage-bc636fe8f9720957f29e5a07cd98531f20368ddd.tar.gz portage-bc636fe8f9720957f29e5a07cd98531f20368ddd.tar.bz2 portage-bc636fe8f9720957f29e5a07cd98531f20368ddd.zip | |
Handle unpickle AttributeError (bug #381705).
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/BlockerCache.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index 5c4f43e52..8a1c88478 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -1,6 +1,7 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +import errno import sys from portage.util import writemsg from portage.data import secpass @@ -58,8 +59,11 @@ class BlockerCache(portage.cache.mappings.MutableMapping): self._cache_data = mypickle.load() f.close() del f - except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError) as e: - if isinstance(e, pickle.UnpicklingError): + except (AttributeError, EnvironmentError, ValueError, pickle.UnpicklingError) as e: + if isinstance(e, EnvironmentError) and \ + getattr(e, 'errno', None) in (errno.ENOENT, errno.EACCES): + pass + else: writemsg("!!! Error loading '%s': %s\n" % \ (self._cache_filename, str(e)), noiselevel=-1) del e |