1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 09:50:07 +02:00

Merge branch 'vm-provider-lookup-flaw' into 'master'

fix vm provider lookup flaw

See merge request fdroid/fdroidserver!382
This commit is contained in:
Hans-Christoph Steiner 2017-11-25 17:10:43 +00:00
commit 9aacdf3fe3

View File

@ -146,7 +146,7 @@ def get_build_vm(srvdir, provider=None):
has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant',
'machines', 'default', 'libvirt'))
has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant',
'machines', 'default', 'libvirt'))
'machines', 'default', 'virtualbox'))
if has_libvirt_machine and has_vbox_machine:
logger.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
return VirtualboxBuildVm(abssrvdir)