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

Author: c-po

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)