mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +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:
commit
9aacdf3fe3
@ -146,7 +146,7 @@ def get_build_vm(srvdir, provider=None):
|
|||||||
has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant',
|
has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant',
|
||||||
'machines', 'default', 'libvirt'))
|
'machines', 'default', 'libvirt'))
|
||||||
has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant',
|
has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant',
|
||||||
'machines', 'default', 'libvirt'))
|
'machines', 'default', 'virtualbox'))
|
||||||
if has_libvirt_machine and has_vbox_machine:
|
if has_libvirt_machine and has_vbox_machine:
|
||||||
logger.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
|
logger.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
|
||||||
return VirtualboxBuildVm(abssrvdir)
|
return VirtualboxBuildVm(abssrvdir)
|
||||||
|
Loading…
Reference in New Issue
Block a user