From 08d89455aa848f95fcfa4ae35451c0a86563401d Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Fri, 3 Aug 2007 20:18:30 +0000
Subject: 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
---
 lib/puppet/util/config.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/puppet')

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]
-- 
cgit