From e6cf2f421b7469e18a27cd1a77c529d049d732c6 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Fri, 13 Jul 2012 13:31:12 -0400 Subject: [PATCH] Set tool dependency status to installed if the dependency is already installed. --- lib/galaxy/tool_shed/tool_dependencies/install_util.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/galaxy/tool_shed/tool_dependencies/install_util.py b/lib/galaxy/tool_shed/tool_dependencies/install_util.py index 040450b0ee6..7ea11007b1b 100644 --- a/lib/galaxy/tool_shed/tool_dependencies/install_util.py +++ b/lib/galaxy/tool_shed/tool_dependencies/install_util.py @@ -83,6 +83,10 @@ def install_package( app, elem, tool_shed_repository, tool_dependencies=None ): # print 'Installing tool dependencies via fabric script ', proprietary_fabfile_path else: print '\nSkipping installation of tool dependency', package_name, 'version', package_version, 'since it is installed in', install_dir, '\n' + tool_dependency = get_tool_dependency_by_name_version_type_repository( app, tool_shed_repository, package_name, package_version, 'package' ) + tool_dependency.status = app.model.ToolDependency.installation_status.INSTALLED + sa_session.add( tool_dependency ) + sa_session.flush() return tool_dependency def install_via_fabric( app, tool_dependency, actions_elem, install_dir, package_name=None, proprietary_fabfile_path=None, **kwd ): """Parse a tool_dependency.xml file's tag set to gather information for the installation via fabric."""