From 0b53b0ece05d628a2c8b368e31e620c7b2338db7 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Tue, 6 Jun 2023 12:00:17 +0200
Subject: [PATCH] move the logfile creation into main
---
mpsd-software-environment.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index 374daf1..142e066 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -517,8 +517,7 @@ def install_environment(
# Set required variables
release_base_dir = script_dir / mpsd_release
- os.environ.get("MPSD_OS", "UNKNOWN_OS")
- mpsd_microarch = os.environ.get("MPSD_MICROARCH", "UNKNOWN_MICROARCH")
+
toolchain_dir = release_base_dir / mpsd_microarch
toolchain_dir.mkdir(parents=True, exist_ok=True)
spack_setup_script = release_base_dir / "spack-environments" / "spack_setup.sh"
@@ -558,11 +557,7 @@ def install_environment(
# _mpsd_spack_ver_ with mpsd_release
logging.info(f"Installing toolchain {toolchain} to {toolchain_dir}")
- install_log_file = (
- config_vars["build_log_file"]
- .replace("mpsd_spack_ver_", f"{mpsd_release}_")
- .replace("_toolchains_", f"_{toolchain}_")
- )
+
# log the command
setup_log_cmd(
mpsd_release,
@@ -680,7 +675,16 @@ def main():
# Carry out the action
args = parser.parse_args()
+ # Get machine configs
+ os.environ.get("MPSD_OS", "UNKNOWN_OS")
+ os.environ.get("MPSD_MICROARCH", "UNKNOWN_MICROARCH")
# parse logging first
+ # decide the log_file_name
+ (
+ config_vars["build_log_file"]
+ .replace("mpsd_spack_ver_", f"{mpsd_release}_")
+ .replace("_toolchains_", f"_{toolchain}_")
+ )
set_up_logging(args.loglevel)
# target dir is the place where this script exists. the
--
GitLab