commit/galaxy-central: greg: More fixes for fabric.local elimination when installing tool dependencies.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/43dfc8ccc72e/ Changeset: 43dfc8ccc72e User: greg Date: 2014-02-25 21:04:08 Summary: More fixes for fabric.local elimination when installing tool dependencies. Affected #: 1 file diff -r 1edc3c13a7a272102a2a9c178440466ba7ab5525 -r 43dfc8ccc72ea49314c25dce9248d66d279dfe01 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 @@ -15,6 +15,7 @@ from contextlib import contextmanager from galaxy.util import DATABASE_MAX_STRING_SIZE +from galaxy.util import DATABASE_MAX_STRING_SIZE_PRETTY from galaxy.util import shrink_string_by_size from galaxy.util import unicodify from galaxy.util.template import fill_template @@ -227,12 +228,10 @@ stdout = output.stdout stderr = output.stderr if len( stdout ) > DATABASE_MAX_STRING_SIZE: - print "Process id %s stdout > %s, so only a portion will be saved in the database." % \ - ( str( pid ), str( DATABASE_MAX_STRING_SIZE_PRETTY ) ) + print "Length of stdout > %s, so only a portion will be saved in the database." % str( DATABASE_MAX_STRING_SIZE_PRETTY ) stdout = shrink_string_by_size( stdout, DATABASE_MAX_STRING_SIZE, join_by="\n..\n", left_larger=True, beginning_on_size_error=True ) if len( stderr ) > DATABASE_MAX_STRING_SIZE: - print "Process id %s stderr > %s, so only a portion will be saved in the database." % \ - ( str( pid ), str( DATABASE_MAX_STRING_SIZE_PRETTY ) ) + print "Length of stderr > %s, so only a portion will be saved in the database." % str( DATABASE_MAX_STRING_SIZE_PRETTY ) stderr = shrink_string_by_size( stderr, DATABASE_MAX_STRING_SIZE, join_by="\n..\n", left_larger=True, beginning_on_size_error=True ) if output.return_code not in [ 0 ]: tool_dependency.status = app.install_model.ToolDependency.installation_status.ERROR 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