Catch BadPickleGet exceptions as well.

2008-11-18  Johan Dahlin  <jdahlin@async.com.br>

        * giscanner/cachestore.py:
        Catch BadPickleGet exceptions as well.

svn path=/trunk/; revision=942

diff --git a/ChangeLog b/ChangeLog
index 383e564..7319e02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-18  Johan Dahlin  <jdahlin@async.com.br>
+
+       * giscanner/cachestore.py:
+       Catch BadPickleGet exceptions as well.  
+
 2008-11-17  Owen Taylor  <otaylor@redhat.com>
 
        * tests/everything/everything.c: Fix doc comment annotations

diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
index 264ccee..11c5d75 100644 (file)
--- a/giscanner/cachestore.py
+++ b/giscanner/cachestore.py
@@ -106,7 +106,7 @@ class CacheStore(object):
             return None
         try:
             data = cPickle.load(fd)
-        except EOFError:
+        except (EOFError, cPickle.BadPickleGet):
             # Broken cache entry, remove it
             self._purge_cache(store_filename)
             data = None