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

Merge branch '496-makebuildserver-does-not-handle-basebox-with-multiple-architectures-correctly' into 'master'

Browse Source 
Resolve "makebuildserver does not handle basebox with multiple architectures correctly"

Closes #496

See merge request fdroid/fdroidserver!513
This commit is contained in:
Marcus 2018-06-05 07:30:51 +00:00
commit a65bc96f51
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makebuildserver
View File

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