From 299ed82a8851eda49c9aeb2ca95fbe625bd073d5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 26 Sep 2016 05:22:05 -0400 Subject: [PATCH] buildserver: consolidate boxfile export code into one block This is just for clarity, and moving more code into the main() function. --- makebuildserver | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/makebuildserver b/makebuildserver index 4985b22f..48828925 100755 --- 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")