From: Michael Pöhn <michael.poehn@fsfe.org>
Date: Fri, 24 Mar 2017 02:15:35 +0000 (+0100)
Subject: delete .vagrant dir when cleaning up buildserver vm
X-Git-Tag: 0.8~56^2~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8cfd3ca770bfa086782a575837b506fcb13d7ffc;p=fdroidserver.git

delete .vagrant dir when cleaning up buildserver vm
---

diff --git a/makebuildserver b/makebuildserver
index 2fc75d82..c4e5e02e 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -304,6 +304,12 @@ def destroy_current_image(v, serverdir):
         v.destroy()
     elif options.verbose:
         print('Cannot run destroy vagrant setup since Vagrantfile.yaml is not setup!')
+
+    try:
+        shutil.rmtree(os.path.join(serverdir, '.vagrant'))
+    except Exception as e:
+        print("could not delete vagrant dir: %s, %s" % (os.path.join(serverdir, '.vagrant'), e))
+
     if config['vm_provider'] == 'libvirt':
         import libvirt
         try: