summaryrefslogtreecommitdiffstats
path: root/plugin_registry.py
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-09-05 19:46:16 +0200
committerJan Pokorný <jpokorny@redhat.com>2014-09-05 19:47:15 +0200
commit09492ef12cb50d959ef4b568283db5d0395a3ee0 (patch)
treec62f7b73a0c55da43d3c569d2a3663d99f665a31 /plugin_registry.py
parent96b620bffe40e8b87319812d27bfe3fe38ff6728 (diff)
downloadclufter-09492ef12cb50d959ef4b568283db5d0395a3ee0.tar.gz
clufter-09492ef12cb50d959ef4b568283db5d0395a3ee0.tar.xz
clufter-09492ef12cb50d959ef4b568283db5d0395a3ee0.zip
plugin_registry: unify passing of look-aside plugins
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'plugin_registry.py')
-rw-r--r--plugin_registry.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin_registry.py b/plugin_registry.py
index ed6b8ae..3053c30 100644
--- a/plugin_registry.py
+++ b/plugin_registry.py
@@ -220,7 +220,7 @@ class PluginManager(object):
self._registry = registry
paths = kwargs.pop('paths', ())
plugins = registry.discover(paths)
- plugins.update(kwargs.pop(registry.name if registry else '', {}))
+ plugins.update(kwargs.pop('plugins', {}))
self._plugins = ProtectedDict(
self._init_plugins(plugins, *args, **kwargs),
)