1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/22f7938bfa33/ changeset: 22f7938bfa33 user: dan date: 2013-02-15 19:18:00 summary: Handle Data Managers when reactivating a deactivated Tool Shed Repository. affected #: 2 files diff -r f53c0039c2c07979b54ce42d680aabbce3be1116 -r 22f7938bfa3331e1f4e03b67b85b1f9602fd1e85 lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -42,6 +42,11 @@ shed_tool_conf, tool_panel_dict, new_install=False ) + if repository.includes_data_managers: + tp, data_manager_relative_install_dir = repository.get_tool_relative_path( trans.app ) + data_manager_relative_install_dir = os.path.join( data_manager_relative_install_dir, repository.name ) #hack to add repository.name here, which is actually the root of the installed repository + new_data_managers = install_data_managers( trans.app, trans.app.config.shed_data_manager_config_file, metadata, repository.get_shed_config_dict( trans.app ), data_manager_relative_install_dir, + repository, repository_tools_tups ) trans.sa_session.add( repository ) trans.sa_session.flush() if repository.includes_datatypes: diff -r f53c0039c2c07979b54ce42d680aabbce3be1116 -r 22f7938bfa3331e1f4e03b67b85b1f9602fd1e85 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -704,7 +704,7 @@ tool_panel_dict=tool_panel_dict, new_install=True ) if 'data_manager' in metadata_dict: - rval = shed_util.install_data_managers( trans.app, trans.app.config.shed_data_manager_config_file, metadata_dict, shed_config_dict, relative_install_dir, + new_data_managers = shed_util.install_data_managers( trans.app, trans.app.config.shed_data_manager_config_file, metadata_dict, shed_config_dict, relative_install_dir, tool_shed_repository, repository_tools_tups ) if 'datatypes' in metadata_dict: tool_shed_repository.status = trans.model.ToolShedRepository.installation_status.LOADING_PROPRIETARY_DATATYPES 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.