From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 8 Jan 2014 10:56:53 +0000 (+0000)
Subject: Only conditionally try to remove completed box
X-Git-Tag: 0.1~23^2~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=883d63f2c3e2fcf93dc2d9559ec51af4ba7960d0;p=fdroidserver.git

Only conditionally try to remove completed box
---

diff --git a/makebuildserver b/makebuildserver
index 3e81da79..8235577a 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -201,5 +201,8 @@ vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir)
 print "Adding box"
 vagrant(['box', 'add', 'buildserver', boxfile, '-f'])
 
-os.remove(boxfile)
+# Remove box file if it exists (older vagrant versions left it there, newer
+# ones seem to delete it
+if os.path.exists(boxfile):
+    os.remove(boxfile)