From f2d2be1d5ed9ae96fe6d744b05a98eddbede0ff8 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Fri, 9 Jun 2023 16:18:00 +0200
Subject: [PATCH] update changes from upstream
---
mpsd-software-environment.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index 92215a5..f66c736 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -315,7 +315,7 @@ def set_up_logging(loglevel="warning", file_path=None):
)
-def get_available_toolchains(release: str) -> List[str]:
+def get_available_toolchains(mpsd_release: str) -> List[str]:
"""Given a release, return the available toolchains.
This is based on the spack-environment's repository [1]. For this function
@@ -343,8 +343,8 @@ def get_available_toolchains(release: str) -> List[str]:
'global_generic']
"""
- logging.debug(f"get_available_toolchains({release=})")
- logging.info(f"Retrieving available toolchains for release {release}")
+ logging.debug(f"get_available_toolchains({mpsd_release=})")
+ logging.info(f"Retrieving available toolchains for release {mpsd_release}")
print_log = logging.getLogger("print")
# create temporary directory
@@ -352,7 +352,7 @@ def get_available_toolchains(release: str) -> List[str]:
tmp_dir_path = Path(tmp_dir.name)
# find toolchains by cloning repository and checking out right branch
- clone_repo(tmp_dir_path, config_vars["spack_environments_repo"], branch=release)
+ clone_repo(tmp_dir_path, config_vars["spack_environments_repo"], branch=mpsd_release)
# look for directories defining the toolchains
# import time
# time.sleep(10)
@@ -369,7 +369,7 @@ def get_available_toolchains(release: str) -> List[str]:
logging.debug(msg)
# summarise toolchains found for use
- print_log.info(f"MPSD software release {release} provides:")
+ print_log.info(f"MPSD software release {mpsd_release} provides:")
print_log.info("Toolchains: \n " + "\n ".join(sorted(toolchain_list)))
print_log.info("Package sets:")
for package_set in package_sets:
--
GitLab