commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/47ddf167c9f1/ Changeset: 47ddf167c9f1 Branch: stable User: natefoo Date: 2013-05-01 15:50:31 Summary: Use Galaxy's ErrorMiddleware since Paste's doesn't return start_response. Fixes downloading tarballs from the Tool Shed when use_debug = false. Affected #: 1 file diff -r 6ab749e3563153f714fe0699435ae9215ebe4ba2 -r 47ddf167c9f11c903a438c0979e101fe7535f061 lib/galaxy/webapps/tool_shed/buildapp.py --- a/lib/galaxy/webapps/tool_shed/buildapp.py +++ b/lib/galaxy/webapps/tool_shed/buildapp.py @@ -160,8 +160,8 @@ log.debug( "Enabling 'eval exceptions' middleware" ) else: # Not in interactive debug mode, just use the regular error middleware - from paste.exceptions import errormiddleware - app = errormiddleware.ErrorMiddleware( app, conf ) + import galaxy.web.framework.middleware.error + app = galaxy.web.framework.middleware.error.ErrorMiddleware( app, conf ) log.debug( "Enabling 'error' middleware" ) # Transaction logging (apache access.log style) if asbool( conf.get( 'use_translogger', True ) ): https://bitbucket.org/galaxy/galaxy-central/commits/cd6c9cc0079c/ Changeset: cd6c9cc0079c User: natefoo Date: 2013-05-01 16:06:21 Summary: Merge stable. Affected #: 2 files diff -r 56e7a8b0823434bd1458a31da4b35cec8acf88a8 -r cd6c9cc0079ce10685c04d003e735d6054a4a8c6 lib/galaxy/webapps/tool_shed/buildapp.py --- a/lib/galaxy/webapps/tool_shed/buildapp.py +++ b/lib/galaxy/webapps/tool_shed/buildapp.py @@ -161,8 +161,8 @@ log.debug( "Enabling 'eval exceptions' middleware" ) else: # Not in interactive debug mode, just use the regular error middleware - from paste.exceptions import errormiddleware - app = errormiddleware.ErrorMiddleware( app, conf ) + import galaxy.web.framework.middleware.error + app = galaxy.web.framework.middleware.error.ErrorMiddleware( app, conf ) log.debug( "Enabling 'error' middleware" ) # Transaction logging (apache access.log style) if asbool( conf.get( 'use_translogger', True ) ): 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)
-
commits-noreply@bitbucket.org