Merge pull request #298 from calcium-machine/develop-catapult

Remove lock on a caught catapult exception.
devopsgroup-io · Sep 23, 2015 · 52e4701 · 52e4701
2 parents 65ee81b + 573d0ff
commit 52e4701
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/VERSION.yml b/VERSION.yml
@@ -1 +1 @@
-version: 1.10.2
+version: 1.10.3
diff --git a/Vagrantfile b/Vagrantfile
@@ -44,6 +44,7 @@ def catapult_exception(error)
     puts "\n"
     puts "Please correct the error then re-run your vagrant command."
     puts "See https://github.com/devopsgroup-io/catapult-release-management for more information."
+    File.delete('.lock')
     exit 1
   end
 end
@@ -90,9 +91,7 @@ end
 
 # locking in order to prevent multiple executions occurring at once (e.g. competing command line and Bamboo executions)
 if File.exist?('.lock')
-  catapult_exception("The .lock file is present in this directory. This indicates that another process, such as provisioning, may be"\
-    " under way in another session or that a process ended unexpectedly. Once verifying that no conflict exists,"\
-    " remove the .lock file and try again.")
+  catapult_exception("The .lock file is present in this directory. This indicates that another process, such as provisioning, may be under way in another session or that a process ended unexpectedly. Once verifying that no conflict exists, remove the .lock file and try again.")
 end
 FileUtils.touch('.lock')