1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/40f1816d6857/ changeset: 40f1816d6857 user: greg date: 2012-03-07 19:35:34 summary: Fix for populating the tool panel and generating the integrated_tool_panel.xml file. affected #: 1 file diff -r 1d73ef1ce3cd9040a808511c0f69ae04a514d635 -r 40f1816d685794f4a2ddb139ca25803f2da9b0de lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -72,6 +72,13 @@ self.init_tools( config_filename ) except: log.exception( "Error loading tools defined in config %s", config_filename ) + if self.integrated_tool_panel_config_has_contents: + # Load self.tool_panel based on the order in self.integrated_tool_panel. + self.load_tool_panel() + # Always write the current in-memory integrated_tool_panel to the integrated_tool_panel.xml file. + # This will cover cases where the Galaxy administrator manually edited one or more of the tool panel + # config files, adding or removing locally developed tools or workflows. + self.write_integrated_tool_panel_config_file() def init_tools( self, config_filename ): """ Read the configuration file and load each tool. The following tags are currently supported: @@ -121,13 +128,6 @@ tool_path=tool_path, config_elems=config_elems ) self.shed_tool_confs.append( shed_tool_conf_dict ) - if self.integrated_tool_panel_config_has_contents: - # Load self.tool_panel based on the order in self.integrated_tool_panel. - self.load_tool_panel() - # Always write the current in-memory integrated_tool_panel to the integrated_tool_panel.xml file. - # This will cover cases where the Galaxy administrator manually edited one or more of the tool panel - # config files, adding or removing locally developed tools or workflows. - self.write_integrated_tool_panel_config_file() def load_tool_panel( self ): for key, val in self.integrated_tool_panel.items(): if key.startswith( 'tool_' ): Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.