plugins/providers/virtualbox/provider.rb in vagrant-unbundled-2.2.5.0 vs plugins/providers/virtualbox/provider.rb in vagrant-unbundled-2.2.6.0
- old
+ new
@@ -6,24 +6,25 @@
attr_reader :driver
def self.installed?
Driver::Meta.new
true
- rescue Vagrant::Errors::VirtualBoxInvalidVersion
+ rescue Vagrant::Errors::VirtualBoxInvalidVersion,
+ Vagrant::Errors::VirtualBoxNotDetected,
+ Vagrant::Errors::VirtualBoxKernelModuleNotLoaded,
+ Vagrant::Errors::VirtualBoxInstallIncomplete
return false
- rescue Vagrant::Errors::VirtualBoxNotDetected
- return false
end
def self.usable?(raise_error=false)
# Instantiate the driver, which will determine the VirtualBox
# version and all that, which checks for VirtualBox being present
Driver::Meta.new
true
- rescue Vagrant::Errors::VirtualBoxInvalidVersion
- raise if raise_error
- return false
- rescue Vagrant::Errors::VirtualBoxNotDetected
+ rescue Vagrant::Errors::VirtualBoxInvalidVersion,
+ Vagrant::Errors::VirtualBoxNotDetected,
+ Vagrant::Errors::VirtualBoxKernelModuleNotLoaded,
+ Vagrant::Errors::VirtualBoxInstallIncomplete
raise if raise_error
return false
end
def initialize(machine)