1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/ddff35a4a9ab/ changeset: ddff35a4a9ab user: greg date: 2012-12-20 00:59:07 summary: Fix for retrieving tool dependencies and missing tool dependencies for display in Galaxy. affected #: 1 file
diff -r 10b6b20bfa0731813d17a0d246f5f57c7f5098da -r ddff35a4a9ab3cf22dad10c3b413f919d8d68022 lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -490,15 +490,22 @@ if all_tool_dependencies: tool_dependencies = {} missing_tool_dependencies = {} - for td_key, td_info_dict in all_tool_dependencies.items(): - name = td_info_dict[ 'name' ] - version = td_info_dict[ 'version' ] - type = td_info_dict[ 'type' ] - tool_dependency = get_tool_dependency_by_name_version_type_repository( trans, repository, name, version, type ) - if tool_dependency.status == trans.model.ToolDependency.installation_status.INSTALLED: - tool_dependencies[ td_key ] = td_info_dict + for td_key, val in all_tool_dependencies.items(): + if td_key in [ 'set_environment' ]: + for td_info_dict in val: + name = td_info_dict[ 'name' ] + version = None + type = td_info_dict[ 'type' ] + tool_dependency = get_tool_dependency_by_name_type_repository( trans, repository, name, type ) else: - missing_tool_dependencies[ td_key ] = td_info_dict + name = val[ 'name' ] + version = val[ 'version' ] + type = val[ 'type' ] + tool_dependency = get_tool_dependency_by_name_version_type_repository( trans, repository, name, version, type ) + if tool_dependency and tool_dependency.status == trans.model.ToolDependency.installation_status.INSTALLED: + tool_dependencies[ td_key ] = val + else: + missing_tool_dependencies[ td_key ] = val else: tool_dependencies = None missing_tool_dependencies = None
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.