summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@async.com.br>2008-11-18 11:02:24 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-11-18 11:02:24 +0000
commit5ab26345e9d6552c96dc4c5612bc441cbced2a17 (patch)
treef722625258029c496aab80dc2aff16177f4396f1
parentf48343e8da9fac170c4cb4a66bc751d4911acc58 (diff)
downloadgobject-introspection-5ab26345e9d6552c96dc4c5612bc441cbced2a17.tar.gz
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
-rw-r--r--ChangeLog5
-rw-r--r--giscanner/cachestore.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 383e564e..7319e028 100644
--- 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 264ccee4..11c5d757 100644
--- 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