1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/2d7a64c143d1/ changeset: 2d7a64c143d1 user: greg date: 2012-12-14 16:28:29 summary: Ensure than installed tool dependency information is renderable. affected #: 2 files
diff -r 4516a0bae905696584040bf9237f1a628400ad37 -r 2d7a64c143d1136fdfa6ed2203c22527b04b5ff1 lib/galaxy/util/shed_util_common.py --- a/lib/galaxy/util/shed_util_common.py +++ b/lib/galaxy/util/shed_util_common.py @@ -705,10 +705,6 @@ original_repository_metadata = None readme_file_names = get_readme_file_names( repository.name ) metadata_dict = { 'shed_config_filename' : shed_config_dict.get( 'config_filename' ) } - # If we're regenerating metadata for a repository that contains tools, make sure we keep the tool panel section information. - # Fixme: do we need this? - #if original_repository_metadata and 'tool_panel_section' in original_repository_metadata: - # metadata_dict[ 'tool_panel_section' ] = original_repository_metadata[ 'tool_panel_section' ] readme_files = [] invalid_file_tups = [] invalid_tool_configs = []
diff -r 4516a0bae905696584040bf9237f1a628400ad37 -r 2d7a64c143d1136fdfa6ed2203c22527b04b5ff1 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 @@ -414,6 +414,11 @@ message += "if necessary, and try installing the dependency again." status = "error" tool_shed_repository = tool_dependency.tool_shed_repository + tool_dependency.name = suc.to_safe_string( tool_dependency.name ) + tool_dependency.version = suc.to_safe_string( tool_dependency.version ) + tool_dependency.type = suc.to_safe_string( tool_dependency.type ) + tool_dependency.status = suc.to_safe_string( tool_dependency.status ) + tool_dependency.error_message = suc.to_safe_string( tool_dependency.error_message ) return trans.fill_template( '/admin/tool_shed_repository/browse_tool_dependency.mako', repository=tool_shed_repository, tool_dependency=tool_dependency, @@ -620,7 +625,7 @@ tool_dependencies=tool_dependencies ) for installed_tool_dependency in installed_tool_dependencies: if installed_tool_dependency.status == trans.app.model.ToolDependency.installation_status.ERROR: - message += ' %s' % installed_tool_dependency.error_message + message += ' %s' % suc.to_safe_string( installed_tool_dependency.error_message ) tool_dependency_ids = [ trans.security.encode_id( td.id ) for td in tool_dependencies ] if message: status = 'error'
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.