From 9565587d6c5c214a67dbf9cd0e11439810c4a46f Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Fri, 1 Mar 2013 10:16:20 -0500 Subject: [PATCH] Fix for starting up Galaxy after community webapp was renamed to be tool_shed. --- lib/tool_shed/galaxy_install/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/tool_shed/galaxy_install/__init__.py b/lib/tool_shed/galaxy_install/__init__.py index efa105729c6..9efb1da7680 100644 --- a/lib/tool_shed/galaxy_install/__init__.py +++ b/lib/tool_shed/galaxy_install/__init__.py @@ -28,9 +28,9 @@ class InstalledRepositoryManager( object ): ElementInclude.include( root ) tool_path = root.get( 'tool_path', None ) if tool_path: - tool_shed = tool_shed.util.shed_util_common.clean_tool_shed_url( tool_shed_repository.tool_shed ) + ts = tool_shed.util.shed_util_common.clean_tool_shed_url( tool_shed_repository.tool_shed ) relative_path = os.path.join( tool_path, - tool_shed, + ts, 'repos', tool_shed_repository.owner, tool_shed_repository.name, @@ -45,13 +45,13 @@ class InstalledRepositoryManager( object ): .order_by( self.model.ToolShedRepository.table.c.id ): relative_install_dir = self.get_repository_install_dir( tool_shed_repository ) if relative_install_dir: - installed_repository_dict = galaxy.util.shed_util.load_installed_datatypes( self.app, tool_shed_repository, relative_install_dir ) + installed_repository_dict = tool_shed.util.shed_util.load_installed_datatypes( self.app, tool_shed_repository, relative_install_dir ) if installed_repository_dict: self.installed_repository_dicts.append( installed_repository_dict ) def load_proprietary_converters_and_display_applications( self, deactivate=False ): for installed_repository_dict in self.installed_repository_dicts: if installed_repository_dict[ 'converter_path' ]: - galaxy.util.shed_util.load_installed_datatype_converters( self.app, installed_repository_dict, deactivate=deactivate ) + tool_shed.util.shed_util.load_installed_datatype_converters( self.app, installed_repository_dict, deactivate=deactivate ) if installed_repository_dict[ 'display_path' ]: - galaxy.util.shed_util.load_installed_display_applications( self.app, installed_repository_dict, deactivate=deactivate ) + tool_shed.util.shed_util.load_installed_display_applications( self.app, installed_repository_dict, deactivate=deactivate ) \ No newline at end of file