Skip to content
Snippets Groups Projects
Commit ec712242 authored by Damian Alvarez's avatar Damian Alvarez
Browse files

Corrected logic

parent 71ed7c49
No related branches found
No related tags found
No related merge requests found
...@@ -320,7 +320,7 @@ def pre_ready_hook(self, *args, **kwargs): ...@@ -320,7 +320,7 @@ def pre_ready_hook(self, *args, **kwargs):
override_toolchain_check = os.getenv("JSC_OVERRIDE_TOOLCHAIN_CHECK") override_toolchain_check = os.getenv("JSC_OVERRIDE_TOOLCHAIN_CHECK")
if not override_toolchain_check: if not override_toolchain_check:
toolchain_name = toolchain["name"] toolchain_name = toolchain["name"]
if not toolchain_name in SUPPORTED_TOOLCHAIN_FAMILIES and os.getenv('USER') is not 'swmanage': if not toolchain_name in SUPPORTED_TOOLCHAIN_FAMILIES and os.getenv('USER') not in 'swmanage':
stage = os.getenv("STAGE", default=None) stage = os.getenv("STAGE", default=None)
if stage: if stage:
# Clean things up if it is a Devel stage # Clean things up if it is a Devel stage
...@@ -365,7 +365,7 @@ def pre_ready_hook(self, *args, **kwargs): ...@@ -365,7 +365,7 @@ def pre_ready_hook(self, *args, **kwargs):
# overridden, only experts should know that) # overridden, only experts should know that)
override_mpi_check = os.getenv("JSC_OVERRIDE_MPI_CHECK") override_mpi_check = os.getenv("JSC_OVERRIDE_MPI_CHECK")
if not override_mpi_check: if not override_mpi_check:
if is_mpi and GOLDEN_REPO not in path_to_ec and os.getenv('USER') is not 'swmanage': if is_mpi and GOLDEN_REPO not in path_to_ec and os.getenv('USER') not in 'swmanage':
print_warning( print_warning(
"\nYou are attempting to install a non-system MPI implementation (%s), " "\nYou are attempting to install a non-system MPI implementation (%s), "
"this is very likely to lead to severe performance degradation. Please " "this is very likely to lead to severe performance degradation. Please "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment