Remove check for OSE version, since with VirtualBox 4 this distinction no longer exists.

This commit is contained in:
Mitchell Hashimoto 2011-01-07 01:32:21 -08:00
parent 033dacbefc
commit 8ce95318c7
5 changed files with 3 additions and 18 deletions

View File

@ -13,6 +13,8 @@
- Vagrantfiles are now loaded only once (instead of 4+ times) [GH-238] - Vagrantfiles are now loaded only once (instead of 4+ times) [GH-238]
- Ability to move home vagrant dir (~/.vagrant) by setting VAGRANT_HOME - Ability to move home vagrant dir (~/.vagrant) by setting VAGRANT_HOME
environmental variable. environmental variable.
- Removed check and error for the "OSE" version of VirtualBox, since with
VirtualBox 4 this distinction no longer exists.
## 0.7.0.beta (December 24, 2010) ## 0.7.0.beta (December 24, 2010)

View File

@ -37,7 +37,6 @@ module Vagrant
version = VirtualBox.version version = VirtualBox.version
raise Errors::VirtualBoxNotDetected if version.nil? raise Errors::VirtualBoxNotDetected if version.nil?
raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 4.0 raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 4.0
raise Errors::VirtualBoxInvalidOSE, :version => version.to_s if version.to_s.downcase.include?("ose")
rescue Errors::VirtualBoxNotDetected rescue Errors::VirtualBoxNotDetected
# On 64-bit Windows, show a special error. This error is a subclass # On 64-bit Windows, show a special error. This error is a subclass
# of VirtualBoxNotDetected, so libraries which use Vagrant can just # of VirtualBoxNotDetected, so libraries which use Vagrant can just

View File

@ -275,11 +275,6 @@ module Vagrant
error_key(:vagrantfile_syntax_error) error_key(:vagrantfile_syntax_error)
end end
class VirtualBoxInvalidOSE < VagrantError
status_code(9)
error_key(:virtualbox_invalid_ose)
end
class VirtualBoxInvalidVersion < VagrantError class VirtualBoxInvalidVersion < VagrantError
status_code(17) status_code(17)
error_key(:virtualbox_invalid_version) error_key(:virtualbox_invalid_version)

View File

@ -92,11 +92,6 @@ en:
message is reproduced below for convenience: message is reproduced below for convenience:
%{file} %{file}
virtualbox_invalid_ose: |-
Vagrant has detected you're using an OSE ("Open Source Edition") of VirtualBox.
Vagrant currently doesn't support any of the OSE editions due to slight API
differences. Please download the regular package from virtualbox.org and install
to continue.
virtualbox_invalid_version: |- virtualbox_invalid_version: |-
Vagrant has detected that you have VirtualBox version %{version} installed! Vagrant has detected that you have VirtualBox version %{version} installed!
Vagrant requires that you use at least VirtualBox version 4.0. Please install Vagrant requires that you use at least VirtualBox version 4.0. Please install
@ -459,7 +454,7 @@ en:
puppet_server: puppet_server:
not_detected: |- not_detected: |-
The `%{binary}` binary appears to not be in the PATH of the guest. This The `%{binary}` binary appears to not be in the PATH of the guest. This
could be because the PATH is not properly setup or perhaps Puppet is not could be because the PATH is not properly setup or perhaps Puppet is not
installed on this guest. Puppet provisioning can not continue without installed on this guest. Puppet provisioning can not continue without
Puppet properly installed. Puppet properly installed.
running_puppetd: "Running Puppet agent..." running_puppetd: "Running Puppet agent..."

View File

@ -28,12 +28,6 @@ class EnvironmentTest < Test::Unit::TestCase
VirtualBox.expects(:version).returns(version) VirtualBox.expects(:version).returns(version)
assert_raises(Vagrant::Errors::VirtualBoxInvalidVersion) { @klass.check_virtualbox! } assert_raises(Vagrant::Errors::VirtualBoxInvalidVersion) { @klass.check_virtualbox! }
end end
should "error and exit for OSE VirtualBox" do
version = "4.0.0_OSE"
VirtualBox.expects(:version).returns(version)
assert_raises(Vagrant::Errors::VirtualBoxInvalidOSE) { @klass.check_virtualbox! }
end
end end
context "initialization" do context "initialization" do