2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/61ea14f9a8b6/ Changeset: 61ea14f9a8b6 User: davebgx Date: 2014-02-26 16:19:48 Summary: Fix missing parenthesis. Affected #: 1 file diff -r 070086f7eb7f71ec4324eb9892a56a6028eb3628 -r 61ea14f9a8b62bc891c638329e91b4aee347db0d lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -350,7 +350,7 @@ tool_dependency_type='package' ) if not can_install_tool_dependency: log.debug( "Tool dependency %s version %s cannot be installed (it was probably previously installed), so returning it." % \ - ( str( tool_dependency.name, str( tool_dependency.version ) ) ) ) + ( str( tool_dependency.name ), str( tool_dependency.version ) ) ) return tool_dependency else: can_install_tool_dependency = True https://bitbucket.org/galaxy/galaxy-central/commits/a24050956e78/ Changeset: a24050956e78 User: davebgx Date: 2014-02-26 16:20:44 Summary: Use log instead of print for tool dependency installation processes' stdout and stderr, since twill redirects those streams to a StringIO object. Affected #: 1 file diff -r 61ea14f9a8b62bc891c638329e91b4aee347db0d -r a24050956e787690b7a37564a932fdfb194cdb6a lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -162,14 +162,16 @@ is printed and saved to that thread's queue. The calling thread can then retrieve the data using thread.stdout and thread.stderr. """ + stdout_logger = logging.getLogger( 'fabric_util.STDOUT' ) + stderr_logger = logging.getLogger( 'fabric_util.STDERR' ) for line in iter( stdout.readline, '' ): output = line.rstrip() - print output + stdout_logger.debug( output ) stdout_queue.put( output ) stdout_queue.put( None ) for line in iter( stderr.readline, '' ): output = line.rstrip() - print output + stderr_logger.debug( output ) stderr_queue.put( output ) stderr_queue.put( None ) 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.