1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/c2a2ae70c051/ changeset: c2a2ae70c051 user: greg date: 2012-03-06 23:15:38 summary: Fix for generating ToolSectionLabels in the integrated_tool_panel.xml file. affected #: 2 files diff -r 5a6ec71bd0fff451944785d19f3112ac3e43c413 -r c2a2ae70c05183e8c66c0c6e7a4c2c9ea30f03ec lib/galaxy/tool_shed/install_manager.py --- a/lib/galaxy/tool_shed/install_manager.py +++ b/lib/galaxy/tool_shed/install_manager.py @@ -1,8 +1,6 @@ """ -Manage automatic installation of tools configured in tool_shed_install.xml, all of which were -at some point included in the Galaxy distribution, but are now hosted in the main Galaxy tool -shed. Tools included in tool_shed_install.xml that have already been installed will not be -re-installed. +Manage automatic installation of tools configured in the xxx.xml files in ~/scripts/migrate_tools (e.g., 0002_tools.xml). +All of the tools were at some point included in the Galaxy distribution, but are now hosted in the main Galaxy tool shed. """ import logging, urllib2 from galaxy.tools import ToolSection @@ -13,8 +11,8 @@ class InstallManager( object ): def __init__( self, app, latest_migration_script_number, tool_shed_install_config, migrated_tools_config ): """ - Check tool settings in tool_shed_install_config and install all tools that are not already installed. The tool panel - configuration file is the received migrated_tools_config, which is the reserved file named migrated_tools_conf.xml. + Check tool settings in tool_shed_install_config and install all repositories that are not already installed. The tool + panel configuration file is the received migrated_tools_config, which is the reserved file named migrated_tools_conf.xml. """ self.app = app self.toolbox = self.app.toolbox diff -r 5a6ec71bd0fff451944785d19f3112ac3e43c413 -r c2a2ae70c05183e8c66c0c6e7a4c2c9ea30f03ec lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -232,6 +232,9 @@ if section_item: os.write( fd, ' <workflow id="%s" />\n' % section_item.id ) elif section_key.startswith( 'label_' ): + label_id = section_item.id or '' + label_text = section_item.text or '' + label_version = section_item.version or '' os.write( fd, ' <label id="%s" text="%s" version="%s" />\n' % ( label_id, label_text, label_version ) ) os.write( fd, ' </section>\n' ) os.write( fd, '</toolbox>\n' ) 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.