From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 9 Jan 2014 21:31:58 +0000 (+0000)
Subject: Better makebuildserver verbose output
X-Git-Tag: 0.1~23^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c31b0ccf2e15c564065e8800da9dd30fdadccf23;p=fdroidserver.git

Better makebuildserver verbose output

(and always delete box file, its always there, despite my earlier commit
saying it wasn't)
---

diff --git a/makebuildserver b/makebuildserver
index 96443a72..adaacc4f 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -209,12 +209,11 @@ while not ready:
                 print "Status: " + line
 
 print "Packaging"
-vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir)
+vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir,
+        printout=options.verbose)
 print "Adding box"
-vagrant(['box', 'add', 'buildserver', boxfile, '-f'])
+vagrant(['box', 'add', 'buildserver', boxfile, '-f'],
+        printout=options.verbose)
 
-# 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)
+os.remove(boxfile)