From: Alec Warner <antarus@gentoo.org>
Date: Fri, 12 Jan 2007 04:12:45 +0000 (-0000)
Subject: getbinpkg.py fix except: open can be IOERror or OSError and cPickle can throw an... 
X-Git-Tag: v2.1.2~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa73d98cd2b1f902149568dc1edbdee9c5512e52;p=portage.git

getbinpkg.py fix except: open can be IOERror or OSError and cPickle can throw an unpicklingError

svn path=/main/trunk/; revision=5585
---

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]={}