From efc25ffaab5291e8501f89cecf82ac70dc9431d4 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Mon, 23 Jan 2012 09:44:22 -0500 Subject: [PATCH] Fix for loading tools from tool config(s). --- lib/galaxy/tools/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 9feb44839d5..1867c533b66 100755 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -107,10 +107,11 @@ class ToolBox( object ): self.load_section_tag_set( elem, self.tool_panel, tool_path ) elif elem.tag == 'label': self.load_label_tag_set( elem, self.tool_panel ) - shed_tool_conf_dict = dict( config_filename=config_filename, - tool_path=tool_path, - config_elems=config_elems ) - self.shed_tool_confs.append( shed_tool_conf_dict ) + if parsing_shed_tool_conf: + shed_tool_conf_dict = dict( config_filename=config_filename, + tool_path=tool_path, + config_elems=config_elems ) + self.shed_tool_confs.append( shed_tool_conf_dict ) def get_tool( self, tool_id, tool_version=None ): # Attempt to locate the tool in our in-memory dictionary. if tool_id in self.tools_by_id: