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 8235577a07a6c00b1054f4a4f2bc3e8360dddc86..87dd5112bf7f1650f24fd2edee3cd4c91d25fd5d 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -197,12 +197,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)