Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

also consider $EB_COMSOL_LICENSE_FILE environment variable in custom easyblock for COMSOL #3044

Merged
merged 2 commits into from
Dec 29, 2023
Merged

also consider $EB_COMSOL_LICENSE_FILE environment variable in custom easyblock for COMSOL #3044

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a6a1ad
Use EB_COMSOL_LICENSE_FILE variable name
Micket Nov 29, 2023
e3bbe0b
consider both $EB_COMSOL_LICENSE_FILE and $LMCOMSOL_LICENSE_FILE in C…
boegel Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/comsol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def extract_step(self):
def configure_step(self):
"""Configure COMSOL installation: create license file."""

default_lic_env_var = 'LMCOMSOL_LICENSE_FILE'
default_lic_env_var = 'EB_COMSOL_LICENSE_FILE'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we consider both?

Need to check whether find_flexlm_license considers all variables passed to custom_env_vars (but I think it does)

Copy link
Contributor

@smoors smoors Dec 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i just checked and it does consider all of them indeed. it also considers LM_LICENSE_FILE, but only if custom_env_vars does not yield a valid license.

lic_specs, self.license_env_var = find_flexlm_license(custom_env_vars=[default_lic_env_var],
lic_specs=[self.cfg['license_file']])

Expand Down
Loading