diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-11-20 20:45:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-20 20:45:00 +0100 |
| commit | ab588e47f88df59f0ca85c758cbf9b1942004183 (patch) | |
| tree | bc804b63c754db0acbd89b83b1fa2e63ac87db5a /scripts/utils | |
| parent | 2efc869757dab663130e21a86c6f08bc80f589b9 (diff) | |
| parent | 30a4a8df272aa06bcc9bac3e134029d1274e9638 (diff) | |
| download | vyos-build-ab588e47f88df59f0ca85c758cbf9b1942004183.tar.gz vyos-build-ab588e47f88df59f0ca85c758cbf9b1942004183.zip | |
Merge pull request #840 from dmbaturin/T6877-flavor-merge-fix
scripts: T6877: fix an error when the base flavor for merging has no packages field
Diffstat (limited to 'scripts/utils')
| -rwxr-xr-x | scripts/utils/merge-flavors | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/utils/merge-flavors b/scripts/utils/merge-flavors index 013014e0..79f8180e 100755 --- a/scripts/utils/merge-flavors +++ b/scripts/utils/merge-flavors @@ -58,6 +58,9 @@ if __name__ == '__main__': if 'architectures' not in base_flavor: base_flavor['architectures'] = {} + if 'packages' not in base_flavor: + base_flavor['packages'] = [] + flavor_files = sys.argv[2:] flavor_defs = map(load_flavor, flavor_files) |