From e262f916b395b186271c2303635d4adfcdf9b1f0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 1 Jan 2015 07:31:48 +0530
Subject: [PATCH] ...

---
 src/calibre/utils/config.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index fbc73c739f..10ef899111 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -11,7 +11,7 @@ from copy import deepcopy
 import optparse
 
 from calibre.constants import (config_dir, CONFIG_DIR_MODE, __appname__,
-        get_version, __author__)
+        get_version, __author__, DEBUG)
 from calibre.utils.lock import ExclusiveFile
 from calibre.utils.config_base import (make_config_dir, Option, OptionValues,
         OptionSet, ConfigInterface, Config, prefs, StringConfig, ConfigProxy,
@@ -216,9 +216,10 @@ class DynamicConfig(dict):
                 except SystemError:
                     pass
                 except:
-                    import traceback
-                    print 'Failed to unpickle stored object:'
-                    traceback.print_exc()
+                    print 'WARNING: Failed to unpickle stored config object, ignoring'
+                    if DEBUG:
+                        import traceback
+                        traceback.print_exc()
                     d = {}
         if clear_current:
             self.clear()