Commit bd322a8f authored by Brandon Walts's avatar Brandon Walts
Browse files

Merge branch 'version/2.4' into version/2.5

* version/2.4:
  bugfix: wrong number of arguments
  bugfix: autoflow is a property of the job, not the runnable
parents ecd70225 32ae5e59
......@@ -213,7 +213,7 @@ class BaseRunnable(object):
def dataflow(self, output_ids, branch_name_or_code = 1):
"""Dataflows the output_id(s) on a given branch (default 1). Returns whatever the Perl side returns"""
if branch_name_or_code == 1:
self.autoflow = False
self.input_job.autoflow = False
self.__send_message('DATAFLOW', {'output_ids': output_ids, 'branch_name_or_code': branch_name_or_code, 'params': {'substituted': self.__params.param_hash, 'unsubstituted': self.__params.unsubstituted_param_hash}})
return self.__read_message()['response']
......@@ -94,7 +94,7 @@ def do_run():
fd_out = int(sys.argv[4])
debug = int(sys.argv[5])
usage('Cannot read the file descriptors as integers', 'run')
usage('Cannot read the file descriptors as integers')
runnable(fd_in, fd_out, debug)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment