diff --git a/pandaharvester/commit_timestamp.py b/pandaharvester/commit_timestamp.py index 7148cecd..458e7042 100644 --- 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 index d3b9c12a..931fcc04 100644 --- 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: