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

use configured vm provider in when calling destroy in makebuildserver

Browse Source
This commit is contained in:
Michael Pöhn 2017-03-26 03:15:33 +02:00 committed by Hans-Christoph Steiner
parent a414aa00ff
commit 4347c10d9d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/vmtools.py
View File

@ -47,7 +47,7 @@ def get_build_vm(srvdir, provider=None):
logger.debug('build vm provider \'virtualbox\' selected') logger.debug('build vm provider \'virtualbox\' selected')
return VirtualboxBuildVm(abssrvdir) return VirtualboxBuildVm(abssrvdir)
else: else:
logger.warn('unsupported provider \'%s\' requested', provider) logger.warn('build vm provider not supported: \'%s\'', provider)
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',

2
makebuildserver
View File

@ -483,7 +483,7 @@ def main():
tail = fdroidserver.tail.Tail(logfilename) tail = fdroidserver.tail.Tail(logfilename)
tail.start() tail.start()
vm = fdroidserver.vmtools.get_build_vm(serverdir) vm = fdroidserver.vmtools.get_build_vm(serverdir, provider=config['vm_provider'])
if options.clean: if options.clean:
vm.destroy() vm.destroy()