diff --git a/lib/galaxy/webapps/tool_shed/api/repositories.py b/lib/galaxy/webapps/tool_shed/api/repositories.py index 2d091cfdef8..d09aca9051b 100644 --- a/lib/galaxy/webapps/tool_shed/api/repositories.py +++ b/lib/galaxy/webapps/tool_shed/api/repositories.py @@ -117,7 +117,7 @@ class RepositoriesController( BaseAPIController ): error_message += "invalid parameters received." log.debug( error_message ) return [] - return repository.ordered_installable_revisions( self.app ) + return [ revision[ 1 ] for revision in repository.installable_revisions( self.app, sort_revisions=True ) ] @web.expose_api_anonymous def get_repository_revision_install_info( self, trans, name, owner, changeset_revision, **kwd ): diff --git a/lib/galaxy/webapps/tool_shed/model/__init__.py b/lib/galaxy/webapps/tool_shed/model/__init__.py index 5675f7a3011..04e909e95cd 100644 --- a/lib/galaxy/webapps/tool_shed/model/__init__.py +++ b/lib/galaxy/webapps/tool_shed/model/__init__.py @@ -250,17 +250,16 @@ class Repository( object, Dictifiable ): return downloadable_revision.metadata.get( 'tool_dependencies', [] ) return [] - def installable_revisions( self, app ): - return suc.get_metadata_revisions( self, hg.repository( ui.ui(), self.repo_path( app ) ), sort_revisions=True ) + def installable_revisions( self, app, sort_revisions=True ): + return suc.get_metadata_revisions( self, + hg.repository( ui.ui(), self.repo_path( app ) ), + sort_revisions=sort_revisions ) def is_new( self, app ): repo = hg.repository( ui.ui(), self.repo_path( app ) ) tip_ctx = repo.changectx( repo.changelog.tip() ) return tip_ctx.rev() < 0 - def ordered_installable_revisions( self, app ): - return [ revision[ 1 ] for revision in suc.get_metadata_revisions( self, hg.repository( ui.ui(), self.repo_path( app ) ), downloadable=True ) ] - def repo_path( self, app ): return app.hgweb_config_manager.get_entry( os.path.join( "repos", self.user.username, self.name ) )