Merge pull request #75 from HSF/flin

htcondor: bug fix
HSF · Jul 9, 2020 · 2febfde · 2febfde
2 parents ec5ad43 + 2797916
commit 2febfde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pandaharvester/commit_timestamp.py b/pandaharvester/commit_timestamp.py
@@ -1 +1 @@
-timestamp = "06-07-2020 11:51:26 on flin (by fahui)"
+timestamp = "09-07-2020 04:31:13 on flin (by fahui)"
diff --git a/pandaharvester/harvestersubmitter/htcondor_submitter.py b/pandaharvester/harvestersubmitter/htcondor_submitter.py
@@ -713,6 +713,8 @@ def _handle_one_worker(workspec, to_submit=to_submit_any):
                                                     ce_flavour_str=ce_flavour_str, sdf_suffix_str=sdf_suffix_str)
                         sdf_template_file = os.path.join(self.CEtemplateDir, sdf_template_filename)
                 else:
+                    if self.templateFile:
+                        sdf_template_file = self.templateFile
                     try:
                         # Manually define site condor schedd as ceHostname and central manager as ceEndpoint
                         if self.ceHostname and isinstance(self.ceHostname, list) and len(self.ceHostname) > 0:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		timestamp = "06-07-2020 11:51:26 on flin (by fahui)"
		timestamp = "09-07-2020 04:31:13 on flin (by fahui)"