From 72ca952e6c43494c28d6bb777c22cc6951feacff Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 16 Sep 2024 18:42:56 +0100 Subject: [PATCH] Fix config data and make error handling/logging more robust --- fsutils/build_config.json | 2 +- fsutils/download_list.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fsutils/build_config.json b/fsutils/build_config.json index 8b0c8daeaf..2785ca1ece 100644 --- a/fsutils/build_config.json +++ b/fsutils/build_config.json @@ -16,7 +16,7 @@ }, "os_hosted_folder": { "windows": "windows", - "darwin": "mac", + "macos": "mac", "linux": "linux" }, "platforms_printable": { diff --git a/fsutils/download_list.py b/fsutils/download_list.py index 9a3d8d604f..0f2203aa9f 100644 --- a/fsutils/download_list.py +++ b/fsutils/download_list.py @@ -188,18 +188,19 @@ def unpack_artifacts(path_to_artifacts_directory, config): build_folder = get_hosted_folder_for_build_type(build_type, config) print(f"build_folder {build_folder}") - build_type_dir = os.path.join(path_to_artifacts_directory, build_folder) - try: - os_folder = get_hosted_folder_for_os_type(platform, config) - except KeyError: - print(f"Invalid OS platform {platform} specified by file {file} - skipping") - continue + build_type_dir = os.path.join(path_to_artifacts_directory, build_folder) except Exception as e: - print(f"An error occurred while getting OS folder: {e}") + print(f"An error occurred while creating build_type_dir folder from {path_to_artifacts_directory} and {build_folder}: {e}") + continue + print(f"build_type_dir {build_type_dir}") + os_folder = get_hosted_folder_for_os_type(platform, config) + print(f"os_folder {os_folder}") + try: + unpack_folder = os.path.join(build_type_dir, os_folder) + except Exception as e: + print(f"An error occurred while creating unpack_folder folder from {build_type_dir} and {os_folder}: {e}") continue - - unpack_folder = os.path.join(build_type_dir, os_folder) print(f"unpacking {filename} to {unpack_folder}") try: unzip_file(file, unpack_folder)