import.rb in vagrantup-0.9.0

- old
+ new
@@ -1,38 +1,47 @@
 module Vagrant
-  class Action
+  module Action
     module VM
       class Import
         def initialize(app, env)
           @app = app
         end
 
         def call(env)
-          env.ui.info I18n.t("vagrant.actions.vm.import.importing", :name => env.env.box.name)
+          env[:ui].info I18n.t("vagrant.actions.vm.import.importing", :name => env[:vm].box.name)
 
           # Import the virtual machine
-          env.env.vm.vm = VirtualBox::VM.import(env.env.box.ovf_file.to_s) do |progress|
-            env.ui.clear_line
-            env.ui.report_progress(progress.percent, 100, false)
+          name = File.basename(env[:vm].env.cwd) + "_#{Time.now.to_i}"
+          ovf_file = env[:vm].box.directory.join("box.ovf").to_s
+          env[:vm].uuid = env[:vm].driver.import(ovf_file, name) do |progress|
+            env[:ui].clear_line
+            env[:ui].report_progress(progress, 100, false)
           end
 
           # Clear the line one last time since the progress meter doesn't disappear
           # immediately.
-          env.ui.clear_line
+          env[:ui].clear_line
 
+          # If we got interrupted, then the import could have been
+          # interrupted and its not a big deal. Just return out.
+          return if env[:interrupted]
+
           # Flag as erroneous and return if import failed
-          raise Errors::VMImportFailure if !env["vm"].vm
+          raise Errors::VMImportFailure if !env[:vm].uuid
 
           # Import completed successfully. Continue the chain
           @app.call(env)
         end
 
         def recover(env)
-          if env["vm"].created?
+          if env[:vm].created?
             return if env["vagrant.error"].is_a?(Errors::VagrantError)
 
-            # Interrupted, destroy the VM
-            env["actions"].run(:destroy)
+            # Interrupted, destroy the VM. We note that we don't want to
+            # validate the configuration here.
+            destroy_env = env.clone
+            destroy_env[:validate] = false
+            env[:action_runner].run(:destroy, destroy_env)
           end
         end
       end
     end
   end