haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: fix interpolation error on v1=>v2 upgrade warinings [GH-2142]

This commit is contained in:
Mitchell Hashimoto 2013-09-06 08:51:03 -07:00
parent 90289544d4
commit 20c46d020c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ BUG FIXES:
quickly in a multi-VM environment. quickly in a multi-VM environment.
- core: Handle the case where we get an EACCES cleaning up the .vagrant - core: Handle the case where we get an EACCES cleaning up the .vagrant
directory. directory.
- core: Fix exception on upgrade warnings from V1 to V2. [GH-2142]
- provisioners/chef: Work even with restrictive umask on user. [GH-2121] - provisioners/chef: Work even with restrictive umask on user. [GH-2121]
- provisioners/chef: Fix environment validation to be less restrictive. - provisioners/chef: Fix environment validation to be less restrictive.
- provisioners/puppet: No more "shared folders cannot be found" error. - provisioners/puppet: No more "shared folders cannot be found" error.

2
lib/vagrant/environment.rb
View File

@ -419,10 +419,10 @@ module Vagrant
level = config_errors.empty? ? :warn : :error level = config_errors.empty? ? :warn : :error
output = Util::TemplateRenderer.render( output = Util::TemplateRenderer.render(
"config/messages", "config/messages",
:name => name,
:warnings => config_warnings, :warnings => config_warnings,
:errors => config_errors).chomp :errors => config_errors).chomp
@ui.send(level, I18n.t("vagrant.general.config_upgrade_messages", @ui.send(level, I18n.t("vagrant.general.config_upgrade_messages",
name: name,
:output => output)) :output => output))
# If we had errors, then we bail # If we had errors, then we bail