diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/config.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/puppet/util/config.rb b/lib/puppet/util/config.rb index afec4c943..7731fdc5b 100644 --- a/lib/puppet/util/config.rb +++ b/lib/puppet/util/config.rb @@ -301,13 +301,11 @@ class Puppet::Util::Config end values[section][var.to_s] = value - # Do some annoying skullduggery here. This is so that - # the group can be set in the config file. The problem - # is that we're using the word 'group' twice, which is - # confusing. - if var == :group and section == Puppet[:name] and @config.include?(:group) - @config[:group].value = value + # If the parameter is valid, then set it. + if section == Puppet[:name] and @config.include?(var) + @config[var].value = value end + next end # Don't override set parameters, since the file is parsed |