From 3cb99364e6a83d0064d2838a0c470278903e19ac Mon Sep 17 00:00:00 2001 From: david-sarah <david-sarah@jacaranda.org> Date: Mon, 2 Jul 2012 18:18:47 +0000 Subject: [PATCH] Failing to load a crawler state pickle uses default values, but the exception clause to detect this failure is too narrow; it can also fail with EOFError or KeyError for example. --- src/allmydata/storage/crawler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/storage/crawler.py b/src/allmydata/storage/crawler.py index 3a917b8d..438dd5e3 100644 --- a/src/allmydata/storage/crawler.py +++ b/src/allmydata/storage/crawler.py @@ -194,7 +194,7 @@ class ShareCrawler(service.MultiService): f = open(self.statefile, "rb") state = pickle.load(f) f.close() - except EnvironmentError: + except Exception: state = {"version": 1, "last-cycle-finished": None, "current-cycle": None, -- 2.45.2