Changeset 648dc9

Timestamp:

03/22/2017 12:21:37 AM (8 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

a76fde

Parents:

f32c8a

git-author:

Calum Lind <calumlind+deluge@gmail.com> (03/22/2017 12:07:34 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (03/22/2017 12:21:37 AM)

Message:

#3003 [Label] Fix duplicate context menu entries

Location:

deluge

Files:

• pluginmanagerbase.py (modified) (4 diffs)
• plugins/Label/deluge/plugins/label/gtkui/label_config.py (modified) (1 diff)

deluge/pluginmanagerbase.py

@@ -180 +180 @@
 
             def on_started_error(result, instance):
-                log.warn('Failed to start plugin: %s\n%s', plugin_name, result.getTraceback())
-                component.deregister(instance.plugin)
+                log.error('Failed to start plugin: %s\n%s', plugin_name,
+                          result.getTraceback(elideFrameworkCode=1, detail='brief'))
+                self.plugins[plugin_name.replace('-', ' ')] = instance
+                self.disable_plugin(plugin_name)
                 return False
 
@@ -208 +210 @@
         except Exception as ex:
             log.error('Error when disabling plugin: %s', self.plugin._component_name)
-            log.exception(ex)
+            log.debug(ex)
             d = defer.succeed(False)
 
@@ -214 +216 @@
             ret = True
             if isinstance(result, Failure):
-                log.error('Error when disabling plugin: %s', name)
-                log.exception(result.getTraceback())
+                log.debug('Error when disabling plugin %s: %s', name, result.getTraceback())
                 ret = False
             try:
@@ -222 +223 @@
                 self.config['enabled_plugins'].remove(name)
             except Exception as ex:
-                log.error('Unable to disable plugin: %s', name)
-                log.exception(ex)
+                log.warning('Problems occured disabling plugin: %s', name)
+                log.debug(ex)
                 ret = False
             else:

deluge/plugins/Label/deluge/plugins/label/gtkui/label_config.py

@@ -32 +32 @@
         log.debug('Adding Label Preferences page')
         builder = Builder()
-        builder.add_from_file(self.get_resource('label_pref.glade'))
+        builder.add_from_file(self.get_resource('label_pref.ui'))
 
         self.plugin.add_preferences_page(_('Label'), builder.get_object('label_prefs_box'))