chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
993d635
)
Only conditionally try to remove completed box
author
Ciaran Gultnieks
<ciaran@ciarang.com>
Wed, 8 Jan 2014 10:56:53 +0000
(10:56 +0000)
committer
Ciaran Gultnieks
<ciaran@ciarang.com>
Wed, 8 Jan 2014 11:22:30 +0000
(11:22 +0000)
makebuildserver
patch
|
blob
|
history
diff --git
a/makebuildserver
b/makebuildserver
index 3e81da79f5792f48399aa45aedaa961f47b56742..8235577a07a6c00b1054f4a4f2bc3e8360dddc86 100755
(executable)
--- 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)