From ced200e25616b5b2283b7e7d237ba7c3fa0f38c3 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 28 May 2010 23:26:11 -0700 Subject: [PATCH] When verifying boxes, catch all exceptions --- lib/vagrant/actions/box/verify.rb | 2 +- vagrant.gemspec | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/vagrant/actions/box/verify.rb b/lib/vagrant/actions/box/verify.rb index 22adde14a..8cc74fd6e 100644 --- a/lib/vagrant/actions/box/verify.rb +++ b/lib/vagrant/actions/box/verify.rb @@ -23,7 +23,7 @@ module Vagrant def verify_appliance # We now try to read the applince. If it succeeds, we return true. VirtualBox::Appliance.new(@runner.ovf_file) - rescue VirtualBox::Exceptions::FileErrorException + rescue Exception raise ActionException.new(:box_verification_failed) end end diff --git a/vagrant.gemspec b/vagrant.gemspec index 83ca2b7b8..851da4f96 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -166,6 +166,7 @@ Gem::Specification.new do |s| "test/vagrant/provisioners/chef_solo_test.rb", "test/vagrant/provisioners/chef_test.rb", "test/vagrant/resource_logger_test.rb", + "test/vagrant/ssh_session_test.rb", "test/vagrant/ssh_test.rb", "test/vagrant/systems/linux_test.rb", "test/vagrant/util/error_helper_test.rb", @@ -251,6 +252,7 @@ Gem::Specification.new do |s| "test/vagrant/util/platform_test.rb", "test/vagrant/util/error_helper_test.rb", "test/vagrant/util/plain_logger_test.rb", + "test/vagrant/ssh_session_test.rb", "test/vagrant/ssh_test.rb" ]