Properly detect missing VirtualBox [GH-1918]

CHANGELOG.md

@@ -27,6 +27,7 @@ BUG FIXES:
     is used, avoiding mount errors [GH-1101]
   - SSH channel is closed after the exit status is received, potentially
     eliminating any SSH hangs. [GH-603]
+  - Fix regression where VirtualBox detection wasn't working anymore. [GH-1918]
 
 ## 1.2.3 (July 9, 2013)
 

plugins/providers/virtualbox/driver/meta.rb

@@ -32,7 +32,8 @@ module VagrantPlugins
           # specific driver to instantiate.
           begin
             @version = read_version || ""
-          rescue Vagrant::Util::Subprocess::LaunchError
+          rescue Vagrant::Errors::CommandUnavailable,
+            Vagrant::Errors::CommandUnavailableWindows
             # This means that VirtualBox was not found, so we raise this
             # error here.
             raise Vagrant::Errors::VirtualBoxNotDetected