1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2b7503087b4c/ changeset: 2b7503087b4c user: jgoecks date: 2013-02-05 18:36:59 summary: Tool stdout/err checking: (a) add tool id to error message and (b) add support for specifying 'both' as an alias for searching both stdout and stderr, which matches the documentation. affected #: 1 file diff -r 7b96c5b684d1dbf142a7f9caf7dce76c217d9e09 -r 2b7503087b4c2520bd6d7639d07933f960281792 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1086,7 +1086,7 @@ else: self.trackster_conf = None def parse_inputs( self, root ): - r""" + """ Parse the "<inputs>" element and create appropriate `ToolParameter`s. This implementation supports multiple pages and grouping constructs. """ @@ -1352,14 +1352,17 @@ # and anything to do with "err". If neither stdout nor # stderr were specified, then raise a warning and scan both. for src in src_list: + if re.search( "both", src, re.IGNORECASE ): + regex.stdout_match = True + regex.stderr_match = True if re.search( "out", src, re.IGNORECASE ): regex.stdout_match = True if re.search( "err", src, re.IGNORECASE ): regex.stderr_match = True if (not regex.stdout_match and not regex.stderr_match): - log.warning( "Unable to determine if tool stream " - + "source scanning is output, error, " - + "or both. Defaulting to use both." ) + log.warning( "Tool id %s: unable to determine if tool " + "stream source scanning is output, error, " + "or both. Defaulting to use both." % self.id ) regex.stdout_match = True regex.stderr_match = True self.stdio_regexes.append( regex ) 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.