opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git://github.com/kwilczynski/puppet-functions into kwilczynski-master

Browse source
This commit is contained in:
Roman Barczyński 2011-03-04 14:04:56 +01:00
commit 3a4b4559fe
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
load_vars.rb
View file

@ -57,7 +57,7 @@ module Puppet::Parser::Functions
raise(Puppet::ParseError, raise(Puppet::ParseError,
"Data in the file `%s' is not a hash" % file) unless data.is_a?(Hash) "Data in the file `%s' is not a hash" % file) unless data.is_a?(Hash)
data = ((data[key].is_a?(Hash)) ? data[key] : {}) if key data = ((data[key] and data[key].is_a?(Hash)) ? data[key] : {}) if key
end end
data.each { |param, value| setvar(param, strinterp(value)) } data.each { |param, value| setvar(param, strinterp(value)) }