From f6fc9a9e5623522e042fe59e81da5fe308c13486 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Wed, 27 Feb 2013 11:16:10 -0500 Subject: [PATCH] Clean up remaining references to galaxy.util.shed_util_common. --- lib/galaxy/tools/__init__.py | 2 +- lib/tool_shed/galaxy_install/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 125a7817f22..c8f63c93908 100755 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -920,7 +920,7 @@ class Tool( object ): def tool_shed_repository( self ): # If this tool is included in an installed tool shed repository, return it. if self.tool_shed: - return galaxy.util.shed_util_common.get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( self.app, + return tool_shed.util.shed_util_common.get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( self.app, self.tool_shed, self.repository_name, self.repository_owner, diff --git a/lib/tool_shed/galaxy_install/__init__.py b/lib/tool_shed/galaxy_install/__init__.py index e6d2b0f5271..efa105729c6 100644 --- a/lib/tool_shed/galaxy_install/__init__.py +++ b/lib/tool_shed/galaxy_install/__init__.py @@ -28,7 +28,7 @@ class InstalledRepositoryManager( object ): ElementInclude.include( root ) tool_path = root.get( 'tool_path', None ) if tool_path: - tool_shed = galaxy.util.shed_util_common.clean_tool_shed_url( tool_shed_repository.tool_shed ) + tool_shed = tool_shed.util.shed_util_common.clean_tool_shed_url( tool_shed_repository.tool_shed ) relative_path = os.path.join( tool_path, tool_shed, 'repos',