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 3a917b8d4db5ed9d9630a81a0fd392df5041b8ca..438dd5e319d2ced270f0979a6fdaac74a95f0c49 100644 (file)
--- 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,