Skip to content

Commit

Permalink
improved pchain to set --useAthenaPackages automatically
Browse files Browse the repository at this point in the history
  • Loading branch information
tmaeno committed Feb 25, 2024
1 parent 95d1e82 commit 1b4e4cd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
1.5.73
* fixed module of JobSpec and FileSpec
* to allow main in --useAthenaTag
* improved pchain to set --useAthenaPackages automatically

1.5.72
* fixed for OIDC
Expand Down
8 changes: 8 additions & 0 deletions pandaclient/PchainScript.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,14 @@ def _onExit(dir, del_command):
except Exception:
pass

# check if the workflow uses athena packages
if not options.useAthenaPackages:
with open(workflow_file, "r") as f:
for line in f.readlines():
if re.search(r"^\s*[^#]\s*opt_useAthenaPackages", line):
options.useAthenaPackages = True
break

matchURL = re.search("(http.*://[^/]+)/", Client.baseURLCSRVSSL)
sourceURL = matchURL.group(1)

Expand Down

0 comments on commit 1b4e4cd

Please sign in to comment.