diff options
| author | Alec Warner <antarus@gentoo.org> | 2007-01-12 04:12:45 +0000 |
|---|---|---|
| committer | Alec Warner <antarus@gentoo.org> | 2007-01-12 04:12:45 +0000 |
| commit | fa73d98cd2b1f902149568dc1edbdee9c5512e52 (patch) | |
| tree | c481f4b07b4be4927a4a3086239d40d87758f870 /pym/getbinpkg.py | |
| parent | d053f260bcd65a4a922b172c5c04ce26cae1df8d (diff) | |
| download | portage-fa73d98cd2b1f902149568dc1edbdee9c5512e52.tar.gz portage-fa73d98cd2b1f902149568dc1edbdee9c5512e52.tar.bz2 portage-fa73d98cd2b1f902149568dc1edbdee9c5512e52.zip | |
getbinpkg.py fix except: open can be IOERror or OSError and cPickle can throw an unpicklingError
svn path=/main/trunk/; revision=5585
Diffstat (limited to 'pym/getbinpkg.py')
| -rw-r--r-- | pym/getbinpkg.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py index 6939e4840..c4e7e6793 100644 --- a/pym/getbinpkg.py +++ b/pym/getbinpkg.py @@ -433,9 +433,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= metadata = cPickle.load(metadatafile) sys.stderr.write("Loaded metadata pickle.\n") metadatafile.close() - except SystemExit, e: - raise - except: + except (cPickle.UnpicklingError, OSError, IOError): metadata = {} if not metadata.has_key(baseurl): metadata[baseurl]={} |