Merge pull request #4020 from jmchilton/fix_explicit_container_resolv…

…er_from_config [17.05] Fix setting up explicit container resolution...
galaxyproject · May 12, 2017 · 0bafd68 · 0bafd68
2 parents aa1e4ce + 3332dfb
commit 0bafd68
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/galaxy/tools/deps/container_resolvers/explicit.py b/lib/galaxy/tools/deps/container_resolvers/explicit.py
@@ -24,3 +24,6 @@ def resolve(self, enabled_container_types, tool_info):
                 return container_description
 
         return None
+
+
+__all__ = ("ExplicitContainerResolver", )
diff --git a/lib/galaxy/util/plugin_config.py b/lib/galaxy/util/plugin_config.py
@@ -45,7 +45,14 @@ def __load_plugins_from_element(plugins_dict, plugins_element, extra_kwds):
         plugin_type = plugin_element.tag
         plugin_kwds = dict( plugin_element.items() )
         plugin_kwds.update( extra_kwds )
-        plugin = plugins_dict[ plugin_type ]( **plugin_kwds )
+        try:
+            plugin_klazz = plugins_dict[ plugin_type ]
+        except KeyError:
+            template = "Failed to find plugin of type [%s] in available plugin types %s"
+            message = template % ( plugin_type, str( plugins_dict.keys() ) )
+            raise Exception( message )
+
+        plugin = plugin_klazz( **plugin_kwds )
         plugins.append( plugin )
 
     return plugins