diff options
| author | Daniil Baturin <daniil@baturin.org> | 2026-01-19 19:03:54 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2026-01-19 19:03:54 +0000 |
| commit | 777299e795409affe41a7cf02e5f8e14aca042eb (patch) | |
| tree | 6d312f96bee16443207b67950bd13dfa969fa093 /scripts | |
| parent | 4741d620097a5acabf4b6231ad5269f45a4eb306 (diff) | |
| download | vyos-build-777299e795409affe41a7cf02e5f8e14aca042eb.tar.gz vyos-build-777299e795409affe41a7cf02e5f8e14aca042eb.zip | |
build: T8193: handle the case when build type and architecture mix-in files do not exist
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index bb92ce4e..1ad862ee 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -282,11 +282,19 @@ def build(): build_config = merge_defaults(build_defaults, defaults=build_config) ## Load correct mix-ins - with open(make_toml_path(defaults.BUILD_TYPES_DIR, pre_build_config["build_type"]), 'rb') as f: + build_type_path = make_toml_path(defaults.BUILD_TYPES_DIR, pre_build_config["build_type"]) + if not os.path.exists(build_type_path): + raise ImageBuildError(f'Build type "{pre_build_config["build_type"]}" does not exist') + + with open(build_type_path, 'rb') as f: build_type_config = tomli.load(f) build_config = merge_defaults(build_type_config, defaults=build_config) - with open(make_toml_path(defaults.BUILD_ARCHES_DIR, pre_build_config["architecture"]), 'rb') as f: + build_arch_path = make_toml_path(defaults.BUILD_ARCHES_DIR, pre_build_config["architecture"]) + if not os.path.exists(build_arch_path): + raise ImageBuildError(f'Architecture "{pre_build_config["architecture"]}" is not supported') + + with open(build_arch_path, 'rb') as f: build_arch_config = tomli.load(f) build_config = merge_defaults(build_arch_config, defaults=build_config) |