diff --git a/CHANGELOG.md b/CHANGELOG.md index 4289948e2..adb2b2f9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ localhost on Linux machines. This fixes issues with 12.04. [GH-909] - Fix issue where Vagrant didn't properly detect VBoxManage on Windows if VBOX_INSTALL_PATH contained multiple paths. [GH-885] + - All `vagrant` commands that can take a target VM name can take one even + if you're not in a multi-VM environment. [GH-894] ## 1.0.3 (May 1, 2012) diff --git a/lib/vagrant/command.rb b/lib/vagrant/command.rb index cf500ce54..dc47ec73e 100644 --- a/lib/vagrant/command.rb +++ b/lib/vagrant/command.rb @@ -79,8 +79,6 @@ module Vagrant vms = [] if names.length > 0 names.each do |name| - raise Errors::MultiVMEnvironmentRequired if !@env.multivm? - if pattern = name[/^\/(.+?)\/$/, 1] # This is a regular expression name, so we convert to a regular # expression and allow that sort of matching. diff --git a/test/unit/vagrant/command/base_test.rb b/test/unit/vagrant/command/base_test.rb index fb356478a..7b14a06f5 100644 --- a/test/unit/vagrant/command/base_test.rb +++ b/test/unit/vagrant/command/base_test.rb @@ -68,13 +68,6 @@ describe Vagrant::Command::Base do to raise_error(Vagrant::Errors::NoEnvironmentError) end - it "should raise an exception if a name is given in a non-multivm environment" do - environment.stub(:multivm?).and_return(false) - - expect { instance.with_target_vms("foo") }. - to raise_error(Vagrant::Errors::MultiVMEnvironmentRequired) - end - it "should yield every VM in order is no name is given" do foo_vm = double("foo") foo_vm.stub(:name).and_return("foo")