commit/galaxy-central: greg: Allow tool dependencies with a status of NEVER_INSTALLED to be installed.

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/592d6dd40cd2/ Changeset: 592d6dd40cd2 User: greg Date: 2013-10-07 18:48:25 Summary: Allow tool dependencies with a status of NEVER_INSTALLED to be installed. Affected #: 2 files diff -r 16e3de8d3f13e700ae1cc02d0e9146b8ea351155 -r 592d6dd40cd24eaf30aad2554c104c46144fb6c2 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -148,7 +148,8 @@ """Method called from Galaxy to generate the current list of tool dependency ids for an installed tool shed repository.""" tool_dependencies_select_field = SelectField( name=name, multiple=multiple, display=display ) for tool_dependency in tool_shed_repository.tool_dependencies: - if uninstalled and tool_dependency.status != trans.model.ToolDependency.installation_status.UNINSTALLED: + if uninstalled and tool_dependency.status not in [ trans.model.ToolDependency.installation_status.NEVER_INSTALLED, + trans.model.ToolDependency.installation_status.UNINSTALLED ]: continue option_label = '%s version %s' % ( str( tool_dependency.name ), str( tool_dependency.version ) ) option_value = trans.security.encode_id( tool_dependency.id ) diff -r 16e3de8d3f13e700ae1cc02d0e9146b8ea351155 -r 592d6dd40cd24eaf30aad2554c104c46144fb6c2 templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako --- a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako +++ b/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako @@ -35,7 +35,8 @@ else: error_message = '' if not can_install: - if tool_dependency.status in [ trans.model.ToolDependency.installation_status.UNINSTALLED ]: + if tool_dependency.status in [ trans.model.ToolDependency.installation_status.NEVER_INSTALLED, + trans.model.ToolDependency.installation_status.UNINSTALLED ]: can_install = True if not can_uninstall: if tool_dependency.status not in [ trans.model.ToolDependency.installation_status.UNINSTALLED ]: 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.
participants (1)
-
commits-noreply@bitbucket.org