From 416a76541742997c684158d213e27b420e3a9106 Mon Sep 17 00:00:00 2001 From: John Barney Date: Sun, 10 Feb 2013 01:43:49 -0800 Subject: [PATCH] Removing extra file --- .../providers/virtualbox/action/import.rb~ | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 plugins/providers/virtualbox/action/import.rb~ diff --git a/plugins/providers/virtualbox/action/import.rb~ b/plugins/providers/virtualbox/action/import.rb~ deleted file mode 100644 index e4b155914..000000000 --- a/plugins/providers/virtualbox/action/import.rb~ +++ /dev/null @@ -1,54 +0,0 @@ -module VagrantPlugins - module ProviderVirtualBox - module Action - class Import - def initialize(app, env) - @app = app - end - - def call(env) - env[:ui].info I18n.t("vagrant.actions.vm.import.importing", - :name => env[:machine].box.name) - - # Import the virtual machine - ovf_file = env[:machine].box.directory.join("box.ovf").to_s - if Vagrant::Util::Platform.cygwin? - ovf_file = `cygpath -w #{ovf_file}`.chomp - end - env[:machine].id = env[:machine].provider.driver.import(ovf_file) 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 - - # 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 Vagrant::Errors::VMImportFailure if !env[:machine].id - - # Import completed successfully. Continue the chain - @app.call(env) - end - - def recover(env) - if env[:machine].provider.state.id != :not_created - return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError) - - # Interrupted, destroy the VM. We note that we don't want to - # validate the configuration here, and we don't want to confirm - # we want to destroy. - destroy_env = env.clone - destroy_env[:config_validate] = false - destroy_env[:force_confirm_destroy] = true - env[:action_runner].run(Action.action_destroy, destroy_env) - end - end - end - end - end -end