use configured vm provider in when calling destroy in makebuildserver

diff --git a/fdroidserver/vmtools.py b/fdroidserver/vmtools.py
index a5c0f5ba27219eb8fa07dddfffafdbb423f4b21f..01e000dd932ccd6fcc542b6b684d2dede5b65aa0 100644 (file)
--- a/fdroidserver/vmtools.py
+++ b/fdroidserver/vmtools.py
@@ -47,7 +47,7 @@ def get_build_vm(srvdir, provider=None):
             logger.debug('build vm provider \'virtualbox\' selected')
             return VirtualboxBuildVm(abssrvdir)
         else:
-            logger.warn('unsupported provider \'%s\' requested', provider)
+            logger.warn('build vm provider not supported: \'%s\'', provider)
     has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant',
                                          'machines', 'default', 'libvirt'))
     has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant',

diff --git a/makebuildserver b/makebuildserver
index 703cbdd6a6c5b168510cc58919a6075595455144..c552202800e2d13e190e8d2a004d5834be9cf09f 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -483,7 +483,7 @@ def main():
         tail = fdroidserver.tail.Tail(logfilename)
         tail.start()
 
-    vm = fdroidserver.vmtools.get_build_vm(serverdir)
+    vm = fdroidserver.vmtools.get_build_vm(serverdir, provider=config['vm_provider'])
     if options.clean:
         vm.destroy()