2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/33bec3cae5b7/ Changeset: 33bec3cae5b7 User: dannon Date: 2013-04-25 14:13:16 Summary: Organize multi.py imports. Affected #: 1 file diff -r 75c5ab4e924192528a6d250d61109c05d16f0118 -r 33bec3cae5b7731916349977918c847f7b255267 lib/galaxy/jobs/splitters/multi.py --- a/lib/galaxy/jobs/splitters/multi.py +++ b/lib/galaxy/jobs/splitters/multi.py @@ -1,5 +1,8 @@ -import os, logging, shutil +import os +import logging +import shutil import inspect + from galaxy import model, util https://bitbucket.org/galaxy/galaxy-central/commits/a599aba4d18c/ Changeset: a599aba4d18c User: dannon Date: 2013-04-25 14:19:33 Summary: Patch from Peter Cock to ensure stdout/stderr are separated in dataset info. Affected #: 1 file diff -r 33bec3cae5b7731916349977918c847f7b255267 -r a599aba4d18c634c51d40c68c64148e45f4e083b lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -924,7 +924,13 @@ for dataset in dataset_assoc.dataset.dataset.history_associations + dataset_assoc.dataset.dataset.library_associations: #need to update all associated output hdas, i.e. history was shared with job running dataset.blurb = 'done' dataset.peek = 'no peek' - dataset.info = ( dataset.info or '' ) + context['stdout'] + context['stderr'] + dataset.info = (dataset.info or '') + if context['stdout'].strip(): + #Ensure white space between entries + dataset.info = dataset.info.rstrip() + "\n" + context['stdout'].strip() + if context['stderr'].strip(): + #Ensure white space between entries + dataset.info = dataset.info.rstrip() + "\n" + context['stderr'].strip() dataset.tool_version = self.version_string dataset.set_size() if 'uuid' in context: 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.