From 570b2e58244bfde4c780aa12629a6ca2bc93cb6e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 3 Nov 2012 08:43:56 +0530 Subject: [PATCH] When updating a previously broken plugin, do not show an error message because the previous version of the plugin cannot be loaded --- src/calibre/gui2/preferences/plugins.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py index 382b07260b..912518568a 100644 --- a/src/calibre/gui2/preferences/plugins.py +++ b/src/calibre/gui2/preferences/plugins.py @@ -403,7 +403,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): return all_locations = OrderedDict(ConfigWidget.LOCATIONS) - plugin_action = plugin.load_actual_plugin(self.gui) + try: + plugin_action = plugin.load_actual_plugin(self.gui) + except: + # Broken plugin, fails to initialize. Given that, it's probably + # already configured, so we can just quit. + return installed_actions = OrderedDict([ (key, list(gprefs.get('action-layout-'+key, []))) for key in all_locations])