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

This commit is contained in:
Roman Barczyński 2011-03-04 14:04:56 +01:00
commit 3a4b4559fe

View file

@ -57,7 +57,7 @@ module Puppet::Parser::Functions
raise(Puppet::ParseError,
"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
data.each { |param, value| setvar(param, strinterp(value)) }