mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix .vagrant directory based vm provider lookup

Browse source
This commit is contained in:
Michael Pöhn 2018-11-16 16:53:01 +01:00
parent f96db03121
commit ddcab79817
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/vmtools.py
View file

@ -135,10 +135,14 @@ def get_build_vm(srvdir, provider=None):
logging.debug('could not confirm that either virtualbox or kvm/libvirt are installed') logging.debug('could not confirm that either virtualbox or kvm/libvirt are installed')
# try guessing provider from .../srvdir/.vagrant internals # try guessing provider from .../srvdir/.vagrant internals
has_libvirt_machine = isdir(os.path.join(abssrvdir, '.vagrant', vagrant_libvirt_path = os.path.join(abssrvdir, '.vagrant', 'machines',
'machines', 'default', 'libvirt')) 'default', 'libvirt')
has_vbox_machine = isdir(os.path.join(abssrvdir, '.vagrant', has_libvirt_machine = isdir(vagrant_libvirt_path) \
'machines', 'default', 'virtualbox')) and len(os.listdir(vagrant_libvirt_path)) > 0
vagrant_virtualbox_path = os.path.join(abssrvdir, '.vagrant', 'machines',
'default', 'virtualbox')
has_vbox_machine = isdir(vagrant_virtualbox_path) \
and len(os.listdir(vagrant_virtualbox_path)) > 0
if has_libvirt_machine and has_vbox_machine: if has_libvirt_machine and has_vbox_machine:
logging.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'') logging.info('build vm provider lookup found virtualbox and libvirt, defaulting to \'virtualbox\'')
return VirtualboxBuildVm(abssrvdir) return VirtualboxBuildVm(abssrvdir)