From 2aa552301124389f2efc6eb0387b13049287253a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Fri, 24 Mar 2017 04:16:30 +0100 Subject: [PATCH] makebuildserver prune gloabal vagrant status when purging broken VMs --- makebuildserver | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makebuildserver b/makebuildserver index c4e5e02e..de0f3b47 100755 --- a/makebuildserver +++ b/makebuildserver @@ -304,6 +304,7 @@ def destroy_current_image(v, serverdir): v.destroy() elif options.verbose: print('Cannot run destroy vagrant setup since Vagrantfile.yaml is not setup!') + subprocess.check_call(['vagrant', 'global-status', '--prune']) try: shutil.rmtree(os.path.join(serverdir, '.vagrant')) @@ -346,7 +347,7 @@ def kvm_package(boxfile): img_info = json.loads(img_info_raw.decode('utf-8')) metadata = {"provider": "libvirt", "format": img_info['format'], - "virtual_size": math.ceil(img_info['virtual-size'] / 1024.**3), + "virtual_size": math.ceil(img_info['virtual-size'] / 1024. ** 3), } vagrantfile = """Vagrant.configure("2") do |config|