Commit ebfc68c5 authored by Anton Pershin's avatar Anton Pershin

Fixed issue with join_path in Host

parent c6401bbc
...@@ -38,6 +38,7 @@ class Host(object): ...@@ -38,6 +38,7 @@ class Host(object):
'if you want to use it.') 'if you want to use it.')
path_to_prog = self.programs[prog_name] path_to_prog = self.programs[prog_name]
if path_to_prog is not None: if path_to_prog is not None:
print(self.programs[prog_name], prog_name)
return self.join_path(self.programs[prog_name], prog_name) return self.join_path(self.programs[prog_name], prog_name)
else: else:
return prog_name return prog_name
...@@ -78,7 +79,7 @@ class RemoteHost(Host): ...@@ -78,7 +79,7 @@ class RemoteHost(Host):
self.set_job_id = aux.load_function_from_module(state['job_setter']) self.set_job_id = aux.load_function_from_module(state['job_setter'])
self.check_task_finished = aux.load_function_from_module(state['job_finished_checker']) self.check_task_finished = aux.load_function_from_module(state['job_finished_checker'])
def join_path(self, path_list): def join_path(self, *path_list):
# For RemoteHost, we assume that it is posix-based # For RemoteHost, we assume that it is posix-based
return '/'.join(path_list) return '/'.join(path_list)
......
...@@ -124,8 +124,8 @@ class ExecutableProgramEdge(Edge): ...@@ -124,8 +124,8 @@ class ExecutableProgramEdge(Edge):
trailing_args_keys=(), # "local keys" where trailing args are stored trailing_args_keys=(), # "local keys" where trailing args are stored
remote=False, remote=False,
stdout_processor=None, stdout_processor=None,
chaining_command_at_start='', chaining_command_at_start=lambda d: '',
chaining_command_at_end='', chaining_command_at_end=lambda d: '',
): ):
#predicate = predicate if predicate is not None else dummy_predicate #predicate = predicate if predicate is not None else dummy_predicate
self._output_dict = output_dict self._output_dict = output_dict
...@@ -145,8 +145,8 @@ class ExecutableProgramEdge(Edge): ...@@ -145,8 +145,8 @@ class ExecutableProgramEdge(Edge):
args_str = build_args_line(data, self._keyword_names, self._flag_names, self._trailing_args_keys) args_str = build_args_line(data, self._keyword_names, self._flag_names, self._trailing_args_keys)
working_dir = data[self._working_dir_key] working_dir = data[self._working_dir_key]
stdout_lines, stderr_lines = self._comm.execute_program(self._program_name, args_str, working_dir, stdout_lines, stderr_lines = self._comm.execute_program(self._program_name, args_str, working_dir,
self.chaining_command_at_start, self.chaining_command_at_start(data),
self.chaining_command_at_end) self.chaining_command_at_end(data))
output_data = self._output_dict output_data = self._output_dict
if self._stdout_processor: if self._stdout_processor:
stdout_data = self._stdout_processor(data, stdout_lines) stdout_data = self._stdout_processor(data, stdout_lines)
......
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