From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Oct 2006 20:26:21 +0000 (-0000)
Subject: Catch UnpicklingError when loading the mtimedb (reported by marienz).
X-Git-Tag: v2.1.2~669
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36f4c0aebdead335595d94b2448cf9d73dfdf6f3;p=portage.git

Catch UnpicklingError when loading the mtimedb (reported by marienz).

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

diff --git a/pym/portage.py b/pym/portage.py
index 579c3f5a0..c0286ca09 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6897,7 +6897,7 @@ class MtimeDB(dict):
 			d = mypickle.load()
 			f.close()
 			del f
-		except (IOError, OSError, EOFError):
+		except (IOError, OSError, EOFError, cPickle.UnpicklingError):
 			d = {}
 
 		if "old" in d: