1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00

makebuildserver: fix lookup logic for needs_mutate

This commit is contained in:
Michael Pöhn 2018-06-05 00:03:17 +02:00
parent e8bad73ae4
commit 6266c33027

View File

@ -520,14 +520,9 @@ def main():
yaml.dump(config, f) yaml.dump(config, f)
if config['vm_provider'] == 'libvirt': if config['vm_provider'] == 'libvirt':
found_basebox = False available_providers = [x.provider for x in v.box_list() if x.name == config['basebox']]
needs_mutate = False found_basebox = len(available_providers) > 0
for box in v.box_list(): needs_mutate = 'libvirt' not in available_providers
if box.name == config['basebox']:
found_basebox = True
if box.provider != 'libvirt':
needs_mutate = True
continue
if not found_basebox: if not found_basebox:
if isinstance(config['baseboxurl'], str): if isinstance(config['baseboxurl'], str):
baseboxurl = config['baseboxurl'] baseboxurl = config['baseboxurl']