buildserver: consolidate boxfile export code into one block

This is just for clarity, and moving more code into the main() function.

diff --git a/makebuildserver b/makebuildserver
index 4985b22fbc81bbfb5a16c93b31a80ea0ea102b98..48828925f04b509daa6b9a3e8d3d987e3b44050e 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -20,7 +20,6 @@ if not os.path.exists('makebuildserver') and not os.path.exists('buildserver'):
     sys.exit(1)
 
 
-boxfile = os.path.join(os.getcwd(), 'buildserver.box')
 tail = None
 
 parser = OptionParser()
@@ -69,9 +68,6 @@ elif os.path.exists('makebs.config.py'):
 if '__builtins__' in config:
     del(config['__builtins__'])  # added by compile/exec
 
-if os.path.exists(boxfile):
-    os.remove(boxfile)
-
 # Update cached files.
 cachedir = config['cachedir']
 if not os.path.exists(cachedir):
@@ -471,6 +467,9 @@ def main():
     v.halt()
 
     print("Packaging")
+    boxfile = os.path.join(os.getcwd(), 'buildserver.box')
+    if os.path.exists(boxfile):
+        os.remove(boxfile)
     v.package(output=boxfile)
 
     print("Adding box")