commit/galaxy-central: inithello: Added an error message to the repository clone error handling.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/1475240809a7/ changeset: 1475240809a7 user: inithello date: 2012-09-07 17:54:02 summary: Added an error message to the repository clone error handling. affected #: 2 files diff -r 0491c108154248cab0006533d30e462df3ade6f9 -r 1475240809a7e9b996aa7b9026b33e20ea9209bd lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -363,7 +363,8 @@ noupdate=False, rev=util.listify( str( ctx_rev ) ) ) return True - except: + except Exception, e: + log.debug( 'Encountered an exception while cloning the repository: %s' % e ) return False def copy_sample_file( app, filename, dest_path=None ): """Copy xxx.sample to dest_path/xxx.sample and dest_path/xxx. The default value for dest_path is ~/tool-data.""" diff -r 0491c108154248cab0006533d30e462df3ade6f9 -r 1475240809a7e9b996aa7b9026b33e20ea9209bd lib/galaxy/web/controllers/admin_toolshed.py --- a/lib/galaxy/web/controllers/admin_toolshed.py +++ b/lib/galaxy/web/controllers/admin_toolshed.py @@ -772,15 +772,8 @@ repository_id = kwd[ 'id' ] repository = get_repository( trans, repository_id ) if repository.status in [ trans.model.ToolShedRepository.installation_status.NEW, - trans.model.ToolShedRepository.installation_status.CLONING ]: - message = "The repository '%s' is not yet cloned, please try again..." - status = 'warning' - return trans.response.send_redirect( web.url_for( controller='admin_toolshed', - action='monitor_repository_installation', - **kwd ) ) - if repository.status in [ trans.model.ToolShedRepository.installation_status.ERROR ]: - message = "There was an error installing the repository '%s', please try again..." - status = 'warning' + trans.model.ToolShedRepository.installation_status.CLONING, + trans.model.ToolShedRepository.installation_status.ERROR ]: return trans.response.send_redirect( web.url_for( controller='admin_toolshed', action='monitor_repository_installation', **kwd ) ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket