Merge pull request #244 from HSF/flin

0.5.12; htcondor: default arc type without filename suffix
HSF · Oct 1, 2024 · e32e152 · e32e152
2 parents 9f42bf0 + 052e169
commit e32e152
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pandaharvester/commit_timestamp.py b/pandaharvester/commit_timestamp.py
@@ -1 +1 @@
-timestamp = "10-09-2024 09:15:39 on flin (by mightqxc)"
+timestamp = "01-10-2024 08:19:30 on flin (by mightqxc)"
diff --git a/pandaharvester/harvestersubmitter/htcondor_submitter.py b/pandaharvester/harvestersubmitter/htcondor_submitter.py
@@ -802,7 +802,7 @@ def _choose_credential(workspec):
                         sdf_template_file = self.templateFile
                     elif os.path.isdir(self.CEtemplateDir) and ce_flavour_str:
                         sdf_suffix_str = ""
-                        if ce_info_dict["ce_grid_type"]:
+                        if ce_info_dict["ce_grid_type"] and ce_info_dict["ce_grid_type"] != "arc":
                             sdf_suffix_str = f"_{ce_info_dict['ce_grid_type']}"
                         sdf_template_filename = f"{ce_flavour_str}{sdf_suffix_str}.sdf"
                         sdf_template_file = os.path.join(self.CEtemplateDir, sdf_template_filename)

diff --git a/pandaharvester/panda_pkg_info.py b/pandaharvester/panda_pkg_info.py
@@ -1 +1 @@
-release_version = "0.5.11"
+release_version = "0.5.12"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		timestamp = "10-09-2024 09:15:39 on flin (by mightqxc)"
		timestamp = "01-10-2024 08:19:30 on flin (by mightqxc)"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		release_version = "0.5.11"
		release_version = "0.5.12"