From 35347f8350342daef4285e67d6af8dc8b4457d77 Mon Sep 17 00:00:00 2001
From: Leo Simons <lsimons@schubergphilis.com>
Date: Fri, 25 Jul 2014 15:05:24 +0200
Subject: [PATCH] CLOUDSTACK-7143: try to fix jenkins problems with last 2
 commits

* bundle install needs to run before running the vbox cleaning scripts,
  so move prepare step before clean step
* feature branches have / in their name which is a bad character to
  put into filenames
---
 tools/appliance/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 2cefd793c78..96caf78ea5e 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -499,13 +499,13 @@ function hyperv_export() {
 ###
 
 function main() {
+  prepare
   if [ "${clean_vbox}" == "1" ]; then
     clean_vbox --delete
     add_on_exit clean_vbox --delete
   else
     stop_vbox # some extra encouragement for virtualbox to stop things
   fi
-  prepare
   create_definition
   veewee_destroy # in case of left-over cruft from failed build
   add_on_exit veewee_destroy