From: Daira Hopwood Date: Thu, 5 Sep 2013 18:15:59 +0000 (+0100) Subject: Mon Jul 2 19:18:47 BST 2012 david-sarah@jacaranda.org X-Git-Url: https://git.rkrishnan.org/pf/status?a=commitdiff_plain;h=4218739359e5950285f01931d582fe49c89e109e;p=tahoe-lafs%2Ftahoe-lafs.git Mon Jul 2 19:18:47 BST 2012 david-sarah@jacaranda.org * 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. --- 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,