From 529ece5e01e07384a510c7024964320f7eb8a64e Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 16 Sep 2024 16:55:50 +0100 Subject: [PATCH] Fix mismatches between data and Config class --- fsutils/build_config.json | 4 ---- fsutils/build_config.py | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fsutils/build_config.json b/fsutils/build_config.json index d72b5e6f27..8b0c8daeaf 100644 --- a/fsutils/build_config.json +++ b/fsutils/build_config.json @@ -35,10 +35,6 @@ "Alpha": "alpha", "Nightly": "nightly" }, - "grid_type_mapping": { - "SecondLife": "sl", - "OpenSim": "os" - }, "build_type_mapping": { "regular": "regular", "avx": "avx", diff --git a/fsutils/build_config.py b/fsutils/build_config.py index 6b8fe8c97f..c35f89099d 100644 --- a/fsutils/build_config.py +++ b/fsutils/build_config.py @@ -9,12 +9,11 @@ class BuildConfig: self.supported_os_dirs = config_data.get('os_download_dirs', []) # channel_to_build_type is a map from Beta, Release and Nightly to folder names preview release and nightly - self.build_type_hosted_folder = config_data.get('build_types', {}) + self.build_type_hosted_folder = config_data.get('build_type_hosted_folder', {}) self.fs_version_mgr_platform = config_data.get('fs_version_mgr_platform', {}) - self.os_hosted_folder = config_data.get('target_folder', {}) + self.os_hosted_folder = config_data.get('os_hosted_folder', {}) self.platforms_printable = config_data.get('platforms_printable', {}) self.grids_printable = config_data.get('grids_printable', {}) self.download_root = config_data.get('download_root', '') self.viewer_channel_mapping = config_data.get('viewer_channel_mapping', {}) - self.grid_type_mapping = config_data.get('grid_type_mapping', {}) self.build_type_mapping = config_data.get('build_type_mapping', {})