From fc41d8a5f5c0ce071457e1ad0180e2bd025ea8ec Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Tue, 24 Apr 2012 14:25:23 -0400 Subject: [PATCH] Fix for installing from a list of tool shed repositories that matched a search criteria. --- lib/galaxy/webapps/community/controllers/repository.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/community/controllers/repository.py b/lib/galaxy/webapps/community/controllers/repository.py index 99d55696bda..e42bd5bc466 100644 --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -755,10 +755,14 @@ class RepositoryController( BaseUIController, ItemRatings ): if not includes_tools and 'tools' in repository_metadata.metadata: includes_tools = True repository = get_repository( trans, trans.security.encode_id( repository_metadata.repository_id ) ) - repository_id = trans.security.encode_id( repository.id ) + # Get the changelog rev for this changeset_revision. + repo_dir = repository.repo_path + repo = hg.repository( get_configured_ui(), repo_dir ) changeset_revision = repository_metadata.changeset_revision + ctx = get_changectx_for_changeset( repo, changeset_revision ) + repository_id = trans.security.encode_id( repository.id ) repository_clone_url = generate_clone_url( trans, repository_id ) - repo_info_dict[ repository.name ] = ( repository.description, repository_clone_url, changeset_revision ) + repo_info_dict[ repository.name ] = ( repository.description, repository_clone_url, changeset_revision, str( ctx.rev() ) ) return encode( repo_info_dict ), includes_tools @web.expose def preview_tools_in_changeset( self, trans, repository_id, **kwd ):