Merge branch 'release/0.3.0-rc.1'

tbatchelli · Oct 23, 2013 · 486e2f0 · 486e2f0
2 parents 0458656 + b1bf355
commit 486e2f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ but sticking vmfest in your classpath will suffice.
 Add the following dependencies to your ```project.clj```:
 
 ```clojure
-   [vmfest "0.3.0-beta.3"]
+   [vmfest "0.3.0-rc.1"]
    [org.clojars.tbatchelli/vboxjxpcom "4.2.4"]
 ```
 

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject vmfest "0.3.0-beta.3"
+(defproject vmfest "0.3.0-rc.1"
   :description "Manage local VMs from the REPL"
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.2.1"]
@@ -15,7 +15,8 @@
              :ws {:dependencies [[org.clojars.tbatchelli/vboxjws "4.2.4"]]}
              :xpcom {:dependencies [[org.clojars.tbatchelli/vboxjxpcom "4.2.4"]]}
              :dev {:dependencies [[ch.qos.logback/logback-classic "1.0.1"]
-                                  [ch.qos.logback/logback-core "1.0.1"]]}}
+                                  [ch.qos.logback/logback-core "1.0.1"]
+                                  [org.clojure/tools.nrepl "0.2.3"]]}}
   :test-selectors {:default (fn [v] (not (:integration v)))
                    :integration :integration
                    :all (fn [_] true)}

diff --git a/relnotes.md b/relnotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.3.0-rc.1
+
+- Ensure machine is unlocked once it is started. Fixes #67.
+
 ## 0.3.0-beta.3
 
 - Fix issue images would not install on a non-root filesystem.

diff --git a/src/vmfest/virtualbox/machine.clj b/src/vmfest/virtualbox/machine.clj
@@ -293,14 +293,18 @@ See IVirtualbox::openRemoteSession for more details"
           (.waitForCompletion progress (Integer. 30000))
           (let [result-code (.getResultCode progress)]
             (log/debugf "start: VM %s started with result code %s"
-                               machine-id
-                               result-code)
+                        machine-id
+                        result-code)
             result-code)))
       (catch Exception e
         (log/error e "Cannot start machine")
         (conditions/wrap-exception
          e
-         {:message "An error occurred while starting machine"})))))
+         {:message "An error occurred while starting machine"}))
+      (finally
+        ;; creating the VM also creates a session with the VM. We need
+        ;; to make sure we don't hold on to this session #67.
+        (.unlockMachine session)))))
 
 
 (defn save-settings [^IMachine machine]