Whitespace issue fixed

This commit is contained in:
John Barney 2013-02-09 19:42:04 -08:00
parent 73eb86bad0
commit cea8c5dafd
2 changed files with 55 additions and 1 deletions

View File

@ -15,7 +15,7 @@ module VagrantPlugins
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[:machine].id = env[:machine].provider.driver.import(ovf_file) do |progress|
env[:ui].clear_line
env[:ui].report_progress(progress, 100, false)
end

View File

@ -0,0 +1,54 @@
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