Merge pull request #3 from linlin-coder/develop

fix: make解析异常
linlin-coder · Sep 13, 2023 · 457c754 · 457c754
2 parents d8a2555 + a8acb7d
commit 457c754
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Workflow/BaseParserJob/baseworkflow.py b/src/Workflow/BaseParserJob/baseworkflow.py
@@ -407,6 +407,7 @@ def resolution_makefile_unfold(self, cmd_str):
             else:
                 new_cmd_list.append(cmd)
         new_cmd_str += ' {sep}'.format(sep=self.separate).join(new_cmd_list)
+        new_cmd_str = new_cmd_str.replace(self.separate, ' \n')
         return new_cmd_str
 
     def replace_jobname(self, a_job_name):
@@ -573,7 +574,7 @@ def jobobject_overloading2(self, unoverloading_cmd, a_job):
             unoverloaded_cmd = " ".join(mm)
             unoverloaded_cmd_list.append(unoverloaded_cmd)
         # unoverloaded_cmd_str = ' {sep}'.format(sep=self.separate).join(unoverloaded_cmd_list)#.replace('\\ &&\\','\\')
-        unoverloaded_cmd_str = ' \n'.format(sep=self.separate).join(unoverloaded_cmd_list)#.replace('\\ &&\\','\\')
+        unoverloaded_cmd_str = ' {sep}'.format(sep=self.separate).join(unoverloaded_cmd_list)#.replace('\\ &&\\','\\')
         return unoverloaded_cmd_str
 
     def write_Command_to_file(self):