Commit ad390fe6 authored by Michael Salim's avatar Michael Salim
Browse files

Merge branch 'develop' of xgitlab.cels.anl.gov:turam/hpc-edge-service into develop

parents a10ad1ce e13cb354
......@@ -225,7 +225,6 @@ def spawn_child(clone=False, **kwargs):
raise ValueError(f"Invalid field {k}")
child.working_directory = '' # This is essential
child.db_write_client = None
newparents = json.loads(current_job.parents)
newparents.append(str(current_job.job_id))
......
......@@ -341,7 +341,7 @@ auto timeout retry: {self.auto_timeout_retry}
app = ApplicationDefinition.objects.get(name=self.application)
line = f"{app.executable} {self.application_args}"
else:
line = self.direct_command
line = f"{self.direct_command} {self.application_args}"
return ' '.join(os.path.expanduser(w) for w in line.split())
def get_children(self):
......
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