opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in BjoernGruening/galaxy-central-4 (pull request #454)

Browse Source 
Fixes for recent Tool Shed code cleanups
This commit is contained in:
John Chilton
2014-08-12 09:04:01 -04:00
parent ec34167345 bf8172e358
commit ead6e62dd4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
+1 -2
View File
@@ -239,8 +239,7 @@ class ToolShedRepositoriesController( BaseAPIController ):
tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True )
self.__ensure_can_install_repos( trans )
install_repository_manager = InstallRepositoryManager( trans.app )
installed_tool_shed_repositories = install_repository_manager.install( trans.app,
tool_shed_url,
installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url,
name,
owner,
changeset_revision,
lib/tool_shed/galaxy_install/install_manager.py
+3 -2
View File
@@ -694,7 +694,8 @@ class InstallRepositoryManager( object ):
name,
owner,
changeset_revision )
installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict,
installed_tool_shed_repositories = self.__install_repositories( tool_shed_url,
repository_revision_dict,
repo_info_dicts,
install_options )
return installed_tool_shed_repositories
@@ -788,7 +789,7 @@ class InstallRepositoryManager( object ):
# at this point because repository dependencies may have added additional repositories for installation
# along with the single specified repository.
encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
initiate_repository_installation( self.app, installation_dict )
self.initiate_repository_installation( installation_dict )
# Some repositories may have repository dependencies that are required to be installed before the
# dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in
# the required order.