vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

build script: T3664: fix handling of missing or malformed flavor files

Browse Source
This commit is contained in:
Daniil Baturin 2024-03-21 13:58:48 +00:00
parent afd04be6c6
commit 65b0321a8b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build-vyos-image
View File

@ -193,9 +193,17 @@ if __name__ == "__main__":
pre_build_config = merge_dicts({}, build_defaults) pre_build_config = merge_dicts({}, build_defaults)
flavor_config = {} flavor_config = {}
build_flavor = args["build_flavor"]
try:
with open(make_toml_path(defaults.BUILD_FLAVORS_DIR, args["build_flavor"]), 'rb') as f: with open(make_toml_path(defaults.BUILD_FLAVORS_DIR, args["build_flavor"]), 'rb') as f:
flavor_config = tomli.load(f) flavor_config = tomli.load(f)
pre_build_config = merge_dicts(flavor_config, pre_build_config) pre_build_config = merge_dicts(flavor_config, pre_build_config)
except FileNotFoundError:
print(f"E: Flavor '{build_flavor}' does not exist")
sys.exit(1)
except tomli.TOMLDecodeError as e:
print(f"E: Failed to parse TOML file for flavor '{build_flavor}': {e}")
sys.exit(1)
## Combine configs args > flavor > defaults ## Combine configs args > flavor > defaults
pre_build_config = merge_dicts(args, pre_build_config, skip_none=True) pre_build_config = merge_dicts(args, pre_build_config, skip_none=True)