summaryrefslogtreecommitdiffstats
path: root/pym/portage/getbinpkg.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-19 12:36:51 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-19 12:36:51 +0000
commit1b83c9cc1d75a28320dd72e3f1875c481d971f7e (patch)
tree28e24775d952fca70bb394ea92e6ec4ed829f369 /pym/portage/getbinpkg.py
parent8be1a1f81066241318ee5be858285ff14500884f (diff)
downloadportage-1b83c9cc1d75a28320dd72e3f1875c481d971f7e.tar.gz
portage-1b83c9cc1d75a28320dd72e3f1875c481d971f7e.tar.bz2
portage-1b83c9cc1d75a28320dd72e3f1875c481d971f7e.zip
Handle ValueError when unpickling, since this can be triggered by an
unsupported pickle protocol. svn path=/main/trunk/; revision=12648
Diffstat (limited to 'pym/portage/getbinpkg.py')
-rw-r--r--pym/portage/getbinpkg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 89252d4b8..f657c67a1 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -491,7 +491,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
out.write("Loaded metadata pickle.\n")
out.flush()
metadatafile.close()
- except (pickle.UnpicklingError, OSError, IOError, EOFError):
+ except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError):
metadata = {}
if baseurl not in metadata:
metadata[baseurl]={}