[42/50] git commit: updated refs/heads/master to 1290e10

[bh...@apache.org]

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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35347f83
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35347f83
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35347f83

Branch: refs/heads/master
Commit: 35347f8350342daef4285e67d6af8dc8b4457d77
Parents: 00b39de
Author: Leo Simons <ls...@schubergphilis.com>
Authored: Fri Jul 25 15:05:24 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Sep 22 21:38:16 2014 +0200

----------------------------------------------------------------------
 tools/appliance/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35347f83/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 2cefd79..96caf78 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