Merge lp:~saviq/elisa/freeze_plugins into lp:elisa

[Michał Sawicz]

Allow freezing a list of plugins that should not be updated automatically. This is needed e.g. for Debian so that the packaging system takes over by default.

[Olivier Tilloy (osomon)]

You added an extra parameter to the do_process_plugins function, but you forgot to adapt 7 other places in the code where it is called.

If in my configuration I set "auto_update_plugins" to "False", I will then get a popup upon availability of updates, and clicking "Update All" will fail with the following traceback:

Traceback (most recent call last):
  File "/home/osomon/dev/elisa-branches/moovida/elisa-plugins/elisa/plugins/poblesec/modal_popup.py", line 148, in _clicked_cb
    button.callback()
  File "/home/osomon/dev/elisa-branches/moovida/elisa-plugins/elisa/plugins/poblesec/main.py", line 592, in <lambda>
    message.new_recommended)),
TypeError: do_process_plugins() takes exactly 3 arguments (2 given)

review: Needs Fixing (functional)

[Michał Sawicz (saviq)]

Sorry about that... Will get back to it and hopefully get this fixed.

Unmerged revisions

1616. By Michał Sawicz on 2010-02-10

Add 'freeze_plugins' option to prevent updates

=== modified file 'elisa-core/elisa/core/plugin_registry.py'
--- elisa-core/elisa/core/plugin_registry.py	2009-11-09 15:44:51 +0000
+++ elisa-core/elisa/core/plugin_registry.py	2010-05-14 16:30:48 +0000
@@ -170,7 +170,8 @@
         {'repository': 'http://plugins.moovida.com/plugin_list',
          'update_plugin_cache': True,
          'auto_update_plugins': True,
-         'auto_install_new_recommended_plugins': True}
+         'auto_install_new_recommended_plugins': True,
+         'freeze_plugins': []}
     config_doc = \
         {'repository': 'The plugin repository to query for new plugins and ' \
             'plugin updates.',
@@ -182,7 +183,9 @@
             'plugin updates. Ignored if update_plugin_cache is False.',
          'auto_install_new_recommended_plugins': 'Whether to silently ' \
             'install all new recommended plugins available. Ignored if ' \
-            'update_plugin_cache is False.'}
+            'update_plugin_cache is False.',
+         'freeze_plugins': 'Plugins from this list won\'t be updated ' \
+            'automatically even if \'auto_update_plugins\' is True'}
 
     def __init__(self, config=None, plugin_dirs=None):
         super(PluginRegistry, self).__init__()
 
=== modified file 'elisa-plugins/elisa/plugins/poblesec/main.py'
--- elisa-plugins/elisa/plugins/poblesec/main.py	2010-01-14 15:32:18 +0000
+++ elisa-plugins/elisa/plugins/poblesec/main.py	2010-05-14 16:30:48 +0000
@@ -471,7 +471,7 @@
         # Plugin updates and/or new recommended plugins are available for
         # download from the plugin repository.
 
-        def iterate_plugins(available_updates, new_recommended, updated):
+        def iterate_plugins(available_updates, new_recommended, updated, frozen):
             plugin_registry = common.application.plugin_registry
 
             def _plugin_updated(result, plugin_dict):
@@ -487,6 +487,10 @@
                 return None
 
             for plugin_dict in available_updates:
+                if plugin_dict['name'] in frozen:
+                    self.debug('Omitted update of %s because it\'s frozen.' % \
+                        plugin_dict['name'])
+                    continue
                 dfr = plugin_registry.update_plugin(plugin_dict)
                 dfr.addCallback(_plugin_updated, plugin_dict)
                 dfr.addErrback(_update_failed, plugin_dict)
@@ -516,16 +520,16 @@
                 dfr.addCallback(_plugin_installed, plugin_dict)
                 yield dfr
 
-        def process_plugins(result, updates, new, updated):
-            return task.coiterate(iterate_plugins(updates, new, updated))
+        def process_plugins(result, updates, new, updated, frozen):
+            return task.coiterate(iterate_plugins(updates, new, updated, frozen))
 
-        def do_process_plugins(updates, new):
+        def do_process_plugins(updates, new, frozen):
             if self._popup_visible:
                 dfr = self.hide_popup()
             else:
                 dfr = defer.succeed(None)
             updated = []
-            dfr.addCallback(process_plugins, updates, new, updated)
+            dfr.addCallback(process_plugins, updates, new, updated, frozen)
             dfr.addCallback(self.show_restart_popup, updated)
             return dfr
 
@@ -535,11 +539,14 @@
         silent_install = \
             config.get_option('auto_install_new_recommended_plugins',
                               section='plugin_registry')
+        freeze_plugins = \
+            config.get_option('freeze_plugins', section='plugin_registry')
 
         if silent_update and silent_install:
             # Do not ask the user's confirmation
             return do_process_plugins(message.available_updates,
-                                      message.new_recommended)
+                                      message.new_recommended,
+                                      freeze_plugins)
 
         elif silent_update:
             if len(message.new_recommended) == 0: