From 8ce95318c7e4f6a1df2eee324f77e5a44dd8d745 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 7 Jan 2011 01:32:21 -0800
Subject: [PATCH] Remove check for OSE version, since with VirtualBox 4 this
 distinction no longer exists.

---
 CHANGELOG.md                     | 2 ++
 lib/vagrant/environment.rb       | 1 -
 lib/vagrant/errors.rb            | 5 -----
 templates/locales/en.yml         | 7 +------
 test/vagrant/environment_test.rb | 6 ------
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c2af39e5..c81e445e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
   - Vagrantfiles are now loaded only once (instead of 4+ times) [GH-238]
   - Ability to move home vagrant dir (~/.vagrant) by setting VAGRANT_HOME
     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)
 
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index f10bf12f6..afc340bca 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -37,7 +37,6 @@ module Vagrant
         version = VirtualBox.version
         raise Errors::VirtualBoxNotDetected if version.nil?
         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
         # On 64-bit Windows, show a special error. This error is a subclass
         # of VirtualBoxNotDetected, so libraries which use Vagrant can just
diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index 08f537495..24e8e2d26 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -275,11 +275,6 @@ module Vagrant
       error_key(:vagrantfile_syntax_error)
     end
 
-    class VirtualBoxInvalidOSE < VagrantError
-      status_code(9)
-      error_key(:virtualbox_invalid_ose)
-    end
-
     class VirtualBoxInvalidVersion < VagrantError
       status_code(17)
       error_key(:virtualbox_invalid_version)
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 664e2efcc..f998d8d9b 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -92,11 +92,6 @@ en:
         message is reproduced below for convenience:
 
         %{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: |-
         Vagrant has detected that you have VirtualBox version %{version} installed!
         Vagrant requires that you use at least VirtualBox version 4.0. Please install
@@ -459,7 +454,7 @@ en:
       puppet_server:
         not_detected: |-
           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
           Puppet properly installed.
         running_puppetd: "Running Puppet agent..."
diff --git a/test/vagrant/environment_test.rb b/test/vagrant/environment_test.rb
index 1932ef10d..004db8058 100644
--- a/test/vagrant/environment_test.rb
+++ b/test/vagrant/environment_test.rb
@@ -28,12 +28,6 @@ class EnvironmentTest < Test::Unit::TestCase
       VirtualBox.expects(:version).returns(version)
       assert_raises(Vagrant::Errors::VirtualBoxInvalidVersion) { @klass.check_virtualbox! }
     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
 
   context "initialization" do