From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 18:15:39 +0000 (+0100)
Subject: Tue Jul  3 15:45:22 BST 2012  david-sarah@jacaranda.org
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty//%22%3C?a=commitdiff_plain;h=9551db680bb62145bb68bd59da372bf5ada3b200;p=tahoe-lafs%2Ftahoe-lafs.git

Tue Jul  3 15:45:22 BST 2012  david-sarah@jacaranda.org
  * Slightly improve the error message when a stats.pickle file cannot be read.
---

diff --git a/src/allmydata/stats.py b/src/allmydata/stats.py
index ea0a7f85..7db323ba 100644
--- a/src/allmydata/stats.py
+++ b/src/allmydata/stats.py
@@ -256,7 +256,8 @@ class PickleStatsGatherer(StdOutStatsGatherer):
             try:
                 self.gathered_stats = pickle.load(f)
             except Exception:
-                print ("Error while attempting to load pickle file %s.\nYou may need to delete this file.\n" %
+                print ("Error while attempting to load pickle file %s.\n"
+                       "You may need to restore this file from a backup, or delete it if no backup is available.\n" %
                        quote_output(os.path.abspath(self.picklefile)))
                 raise
             f.close()