diff options
| author | Roman Barczyński <romke@estrefa.pl> | 2011-03-04 14:06:42 +0100 |
|---|---|---|
| committer | Roman Barczyński <romke@estrefa.pl> | 2011-03-04 14:06:42 +0100 |
| commit | 36ec2c36ea4c4456da59340274b1cef669168a39 (patch) | |
| tree | 3cdfe9d94631921af4ecdfe3ac7023e96e5a133e | |
| parent | ab749e74149ee82cb903ed82dc8396657d1d5b83 (diff) | |
| parent | 3a4b4559fe45b8d6df419301c9464c968068d39f (diff) | |
| download | puppet-stdlib-36ec2c36ea4c4456da59340274b1cef669168a39.tar.gz puppet-stdlib-36ec2c36ea4c4456da59340274b1cef669168a39.tar.bz2 | |
Merge branch 'kwilczynski-master'
| -rw-r--r-- | load_vars.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/load_vars.rb b/load_vars.rb index 07ee745..cc2495b 100644 --- a/load_vars.rb +++ b/load_vars.rb @@ -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)) } |