diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/config.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/util/config.rb b/lib/puppet/util/config.rb index 1bdff5eff..ded78f9c4 100644 --- a/lib/puppet/util/config.rb +++ b/lib/puppet/util/config.rb @@ -836,7 +836,11 @@ Generated on #{Time.now}. Puppet.warning "Discarded unknown configuration parameter %s" % param next end - self[param] = value + if @config[param].setbycli + Puppet.debug "Ignoring %s set by config file; overridden by cli" % param + else + self[param] = value + end end if meta = params[:_meta] |