Skip to content

Commit

Permalink
Show error message when installing latest revision fails
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Oct 16, 2017
1 parent 50322ce commit 5c8ca35
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,7 @@ def install_latest_repository_revision(self, trans, **kwd):
url = util.build_url(tool_shed_url, pathspec=pathspec, params=params)
latest_downloadable_revision = json.loads(raw_text)
if latest_downloadable_revision == hg_util.INITIAL_CHANGELOG_HASH:
message = 'Error retrieving the latest downloadable revision for this repository via the url <b>%s</b>.' % url
status = 'error'
return trans.show_error_message('Error retrieving the latest downloadable revision for this repository via the url <b>%s</b>.' % url)
else:
# Make sure the latest changeset_revision of the repository has not already been installed.
# Updates to installed repository revisions may have occurred, so make sure to locate the
Expand All @@ -464,7 +463,7 @@ def install_latest_repository_revision(self, trans, **kwd):
(latest_downloadable_revision, name, owner)
if current_changeset_revision != latest_downloadable_revision:
message += ' The current changeset revision is <b>%s</b>.' % current_changeset_revision
status = 'error'
return trans.show_error_message(message)
else:
# Install the latest downloadable revision of the repository.
params = dict(name=name,
Expand Down

0 comments on commit 5c8ca35

Please sign in to comment.