diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py index 5a78c284360bad5e838d473f635b338882d30852..94b41b97d3e28637afda0e0136f06e4fa803cb49 100755 --- a/mpsd-software-environment.py +++ b/mpsd-software-environment.py @@ -151,21 +151,20 @@ def read_metadata_from_logfile(logfile: Union[str, Path]) -> dict: } -def get_installer_log_file(args: argparse.Namespace, script_dir: str) -> str: +def get_installer_log_file(mpsd_release: str, cmd: str, script_dir: str) -> str: """Get installer log file name.""" # Get machine configs os.environ.get("MPSD_OS", "UNKNOWN_OS") mpsd_microarch = get_native_microarchitecture() - mpsd_release = args.release # parse logging first # decide the log_file_name installer_log_name, build_log_name = create_log_file_names( - mpsd_release=mpsd_release, mpsd_microarch=mpsd_microarch, action=args.action + mpsd_release=mpsd_release, mpsd_microarch=mpsd_microarch, action=cmd ) - log_folder = script_dir / mpsd_release / mpsd_microarch / "logs" + log_folder = script_dir / mpsd_release / "logs" # if the log_folder dosent exist, dont log this message if # the command is a info-only command - if args.action not in ["status", "available"]: + if cmd not in ["status", "available"]: if not os.path.exists(log_folder): os.makedirs(log_folder) installer_log_file = log_folder / installer_log_name @@ -911,7 +910,9 @@ def main(): # target dir is the place where this script exists. the script_dir = Path(os.path.dirname(os.path.realpath(__file__))) - set_up_logging(args.loglevel, get_installer_log_file(args, script_dir)) + set_up_logging( + args.loglevel, get_installer_log_file(args.release, args.action, script_dir) + ) # Check the command and run related function if args.action == "remove": diff --git a/tests.py b/tests.py index fb43939a3d39da77d1f7263a1c3d640678fff75f..0860417a1898873ecec5c73a097e6a5163230c93 100644 --- a/tests.py +++ b/tests.py @@ -270,6 +270,10 @@ def test_install_environment_zlib(): f.write(lines) # install global_generic toolchain + mod.set_up_logging( + "WARNING", + mod.get_installer_log_file(mpsd_release_to_test, "install", script_dir), + ) mod.install_environment( mpsd_release=mpsd_release_to_test, toolchains=[toolchain_to_test], @@ -332,7 +336,7 @@ def test_install_environment_zlib(): f"{mpsd_release_to_test}_{mpsd_microarch}_*_install.log" ) ) - assert len(build_log) > 1 + assert len(build_log) > 2 def test_metadata_logging(tmp_path):