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

Correct some upstream errors

This commit is contained in:
Ben Hines 2015-07-28 12:20:30 -07:00
parent 97a9cd35fc
commit 4d4bba119a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/provisioners/puppet/config/puppet.rb
View File

@ -54,9 +54,6 @@ module VagrantPlugins
def merge(other) def merge(other)
super.tap do |result| super.tap do |result|
result.facter = @facter.merge(other.facter) result.facter = @facter.merge(other.facter)
result.structured_facts = @facter.merge(other.structured_facts)
result.environment_path = @facter.merge(other.environment_path)
result.environment = @facter.merge(other.environment)
end end
end end
@ -146,7 +143,7 @@ module VagrantPlugins
if !expanded_environment_file.file? && !expanded_environment_file.directory? if !expanded_environment_file.file? && !expanded_environment_file.directory?
errors << I18n.t("vagrant.provisioners.puppet.environment_missing", errors << I18n.t("vagrant.provisioners.puppet.environment_missing",
environment: environment.to_s, environment: environment.to_s,
environment_path: expanded_path.to_s) environmentpath: expanded_path.to_s)
end end
end end
end end