This commit is contained in:
Kovid Goyal 2015-01-01 07:31:48 +05:30
parent 545c314ddc
commit e262f916b3

View File

@ -11,7 +11,7 @@ from copy import deepcopy
import optparse import optparse
from calibre.constants import (config_dir, CONFIG_DIR_MODE, __appname__, 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.lock import ExclusiveFile
from calibre.utils.config_base import (make_config_dir, Option, OptionValues, from calibre.utils.config_base import (make_config_dir, Option, OptionValues,
OptionSet, ConfigInterface, Config, prefs, StringConfig, ConfigProxy, OptionSet, ConfigInterface, Config, prefs, StringConfig, ConfigProxy,
@ -216,9 +216,10 @@ class DynamicConfig(dict):
except SystemError: except SystemError:
pass pass
except: except:
import traceback print 'WARNING: Failed to unpickle stored config object, ignoring'
print 'Failed to unpickle stored object:' if DEBUG:
traceback.print_exc() import traceback
traceback.print_exc()
d = {} d = {}
if clear_current: if clear_current:
self.clear() self.clear()