From 7adffcb880ca0d3ba5d7bec4e0e592c90110498b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 16 Jul 2013 16:34:53 -0700 Subject: [PATCH] CHANGELOG --- CHANGELOG.md | 2 ++ lib/vagrant/util/subprocess.rb | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6adaa7c0..39a5fcee1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ IMPROVEMENTS: BUG FIXES: + - VBoxManage or any other executable missing from PATH properly + reported. Regression from 1.2.2. [GH-1928] - Boxes downloaded as part of `vagrant up` are now done so _prior_ to config validation. This allows Vagrantfiles to references files that may be in the box itself. [GH-1061] diff --git a/lib/vagrant/util/subprocess.rb b/lib/vagrant/util/subprocess.rb index af4646bc9..bf34556dd 100644 --- a/lib/vagrant/util/subprocess.rb +++ b/lib/vagrant/util/subprocess.rb @@ -25,13 +25,12 @@ module Vagrant end def initialize(*command) - progname = command[0] @options = command.last.is_a?(Hash) ? command.pop : {} - @command = command + @command = command.dup @command[0] = Which.which(@command[0]) if !File.file?(@command[0]) if !@command[0] - raise Errors::CommandUnavailableWindows, file: progname if Platform.windows? - raise Errors::CommandUnavailable, file: progname + raise Errors::CommandUnavailableWindows, file: command[0] if Platform.windows? + raise Errors::CommandUnavailable, file: command[0] end @logger = Log4r::Logger.new("vagrant::util::subprocess")