From: Michael Pöhn <michael.poehn@fsfe.org>
Date: Sun, 26 Mar 2017 01:15:33 +0000 (+0200)
Subject: use configured vm provider in when calling destroy in makebuildserver
X-Git-Tag: 0.8~56^2~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4347c10d9d0e6d304bbcb862354aca3d586bf07e;p=fdroidserver.git

use configured vm provider in when calling destroy in makebuildserver
---

diff --git a/fdroidserver/vmtools.py b/fdroidserver/vmtools.py
index a5c0f5ba..01e000dd 100644
--- 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 703cbdd6..c5522028 100755
--- 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()