diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-28 19:36:17 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-28 19:36:17 -0700 |
| commit | 2377357f4e0164d338c1249c79f479229aa7c0e4 (patch) | |
| tree | 5a46d400aa9c72a0df395ea6b3c5428e567c2564 /pym/portage/getbinpkg.py | |
| parent | d5ec77f886ba5891de2d2dcc25700327596df588 (diff) | |
| download | portage-2377357f4e0164d338c1249c79f479229aa7c0e4.tar.gz portage-2377357f4e0164d338c1249c79f479229aa7c0e4.tar.bz2 portage-2377357f4e0164d338c1249c79f479229aa7c0e4.zip | |
Handle KeyError when loading pickles.
See http://forums.gentoo.org/viewtopic-t-938022.html for example.
Diffstat (limited to 'pym/portage/getbinpkg.py')
| -rw-r--r-- | pym/portage/getbinpkg.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index 34a5e0efe..538f8c23c 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -559,7 +559,9 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= out.write(_("Loaded metadata pickle.\n")) out.flush() metadatafile.close() - except (AttributeError, EOFError, EnvironmentError, ValueError, pickle.UnpicklingError): + except (SystemExit, KeyboardInterrupt): + raise + except Exception: metadata = {} if baseurl not in metadata: metadata[baseurl]={} |