diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-08-03 20:18:30 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-08-03 20:18:30 +0000 |
| commit | 08d89455aa848f95fcfa4ae35451c0a86563401d (patch) | |
| tree | cf6405afa36bd894788a6f250c0d70a8f48aee19 /lib/puppet | |
| parent | 5eacd19aa963c8200df12d6ec593573aa3183850 (diff) | |
| download | puppet-08d89455aa848f95fcfa4ae35451c0a86563401d.tar.gz puppet-08d89455aa848f95fcfa4ae35451c0a86563401d.tar.xz puppet-08d89455aa848f95fcfa4ae35451c0a86563401d.zip | |
Fixing #734. The problem was that when I switched how the configs were parsed, I managed to lose the ability to keep values set on the cli from being overridden by values set in config files.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2738 980ebf18-57e1-0310-9a29-db15c13687c0
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] |