summaryrefslogtreecommitdiff
path: root/user/gobject-introspection/we-are-in-a-pickle.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/gobject-introspection/we-are-in-a-pickle.patch')
-rw-r--r--user/gobject-introspection/we-are-in-a-pickle.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/user/gobject-introspection/we-are-in-a-pickle.patch b/user/gobject-introspection/we-are-in-a-pickle.patch
new file mode 100644
index 000000000..5262e2887
--- /dev/null
+++ b/user/gobject-introspection/we-are-in-a-pickle.patch
@@ -0,0 +1,28 @@
+From 945438608433a554b8d7077af648d60a9daf59f9 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sat, 8 Dec 2018 18:44:31 +0100
+Subject: [PATCH] cachestore: don't try to catch nonexisting
+ pickle.BadPickleGet. Fixes #159
+
+pickle.loads() can pretty much throw any kind of exception and we can't
+handle it besides ignoring it, so just catch all.
+---
+ giscanner/cachestore.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
+index 58b3193c..857dc725 100644
+--- a/giscanner/cachestore.py
++++ b/giscanner/cachestore.py
+@@ -178,7 +178,7 @@ class CacheStore(object):
+ return None
+ try:
+ data = pickle.load(fd)
+- except (AttributeError, EOFError, ValueError, pickle.BadPickleGet):
++ except Exception:
+ # Broken cache entry, remove it
+ self._remove_filename(store_filename)
+ data = None
+--
+2.18.1
+