opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure a repository exists before checking its status - thanks to Nicola Soranzo for finding this issue.

Browse Source
This commit is contained in:
Greg Von Kuster
2014-06-27 07:06:48 -04:00
parent 333ce3a71e
commit 3e01352f44
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+4 -4
View File
@@ -1268,8 +1268,8 @@ class AdminToolshed( AdminGalaxy ):
new_kwd = {}
if repository_id is not None:
repository = suc.get_installed_tool_shed_repository( trans.app, repository_id )
if repository.is_new:
if repository:
if repository:
if repository.is_new:
if kwd.get( 'purge_repository_button', False ):
irm = trans.app.installed_repository_manager
purge_status, purge_message = irm.purge_repository( repository )
@@ -1283,10 +1283,10 @@ class AdminToolshed( AdminGalaxy ):
repository=repository )
else:
new_kwd[ 'status' ] = 'error'
new_kwd[ 'message' ] = 'Cannot locate the database record for the repository with encoded id %s.' % str( repository_id )
new_kwd[ 'message' ] = 'Repositories must have a <b>New</b> status in order to be purged.'
else:
new_kwd[ 'status' ] = 'error'
new_kwd[ 'message' ] = 'Repositories must have a <b>New</b> status in order to be purged.'
new_kwd[ 'message' ] = 'Cannot locate the database record for the repository with encoded id %s.' % str( repository_id )
else:
new_kwd[ 'status' ] = 'error'
new_kwd[ 'message' ] = 'Invalid repository id value "None" received for repository to be purged.'