Merge branch 'kwilczynski-master'
This commit is contained in:
commit
36ec2c36ea
1 changed files with 1 additions and 1 deletions
|
@ -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)) }
|
||||
|
|
Loading…
Reference in a new issue