mirror of
https://github.com/rocky-linux/peridot-releng.git
synced 2024-12-23 04:48:35 +00:00
Groups default setting should be based on variant if possible
This commit is contained in:
parent
79fa1c0648
commit
9e91db39a1
@ -280,10 +280,12 @@ def main(comps_path: str, variants_path: str, output_path: str):
|
|||||||
groupbase = variants[variant_id]
|
groupbase = variants[variant_id]
|
||||||
if group.text not in groupbase:
|
if group.text not in groupbase:
|
||||||
continue
|
continue
|
||||||
groupind = groupbase[group.text]
|
groupind = groupbase[group.text].copy()
|
||||||
for arch_group in groupind.keys():
|
for arch_group in groupind.keys():
|
||||||
if arch_group not in groups:
|
if arch_group not in groups:
|
||||||
groups[arch_group] = []
|
groups[arch_group] = []
|
||||||
|
if 'default' in group.attrib:
|
||||||
|
groupind[arch_group].default = group.attrib['default'] == 'true'
|
||||||
groups[arch_group].append(groupind[arch_group])
|
groups[arch_group].append(groupind[arch_group])
|
||||||
elif child.tag == 'environments':
|
elif child.tag == 'environments':
|
||||||
for environment in child:
|
for environment in child:
|
||||||
@ -311,13 +313,13 @@ def main(comps_path: str, variants_path: str, output_path: str):
|
|||||||
for arch in variant_arch_index.keys():
|
for arch in variant_arch_index.keys():
|
||||||
for variant in variant_arch_index[arch].keys():
|
for variant in variant_arch_index[arch].keys():
|
||||||
write_variant(variant_arch_index[arch][variant] if variant in
|
write_variant(variant_arch_index[arch][variant] if variant in
|
||||||
variant_arch_index[
|
variant_arch_index[
|
||||||
arch] else [],
|
arch] else [],
|
||||||
environment_arch_index[arch][variant] if variant in
|
environment_arch_index[arch][variant] if variant in
|
||||||
environment_arch_index[
|
environment_arch_index[
|
||||||
arch] else [],
|
arch] else [],
|
||||||
categories[arch].copy(),
|
categories[arch].copy(),
|
||||||
f'{output_path}/{variant}-{arch}.xml')
|
f'{output_path}/{variant}-{arch}.xml')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
Loading…
Reference in New Issue
Block a user