Merge branch 'master' of git://reductivelabs.com/puppet

7 files changed, 22 insertions, 22 deletions

diff --git a/bin/filebucket b/bin/filebucket
index 2001eaf63..22580cbe3 100755
--- a/bin/filebucket
+++ b/bin/filebucket
@@ -109,7 +109,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -139,7 +139,7 @@ begin
             when "--remote"
                 options[:remote] = true
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
diff --git a/bin/puppet b/bin/puppet
index 36f0fcd62..deeb65c42 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -76,7 +76,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -124,7 +124,7 @@ begin
                     $stderr.puts detail.to_s
                 end
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -156,7 +156,7 @@ end
 
 # Now parse the config
 if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.config.parse(Puppet[:config])
+    Puppet.settings.parse(Puppet[:config])
 end
 
 Puppet.genconfig
@@ -194,8 +194,8 @@ begin
     if Puppet[:parseonly]
         exit(0)
     end
-    client.getconfig
-    client.apply
+    config = client.getconfig
+    config.apply
 rescue => detail
     if detail.is_a?(XMLRPC::FaultException)
         $stderr.puts detail.message
diff --git a/bin/puppetca b/bin/puppetca
index 3dbd87b89..72b2640a3 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -104,7 +104,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -143,7 +143,7 @@ begin
             when "--verbose"
                 Puppet::Util::Log.level = :info
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
diff --git a/bin/puppetd b/bin/puppetd
index a03ed8f10..8d112ca3a 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -178,7 +178,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -216,10 +216,10 @@ begin
                 options[:enable] = true
             when "--test"
                 # Enable all of the most common test options.
-                Puppet.config.handlearg("--ignorecache")
-                Puppet.config.handlearg("--no-usecacheonfailure")
-                Puppet.config.handlearg("--no-splay")
-                Puppet.config.handlearg("--show_diff")
+                Puppet.settings.handlearg("--ignorecache")
+                Puppet.settings.handlearg("--no-usecacheonfailure")
+                Puppet.settings.handlearg("--no-splay")
+                Puppet.settings.handlearg("--show_diff")
                 options[:onetime] = true
                 options[:waitforcert] = 0
                 unless Puppet::Util::Log.level == :debug
@@ -264,7 +264,7 @@ begin
                 options[:waitforcert] = arg.to_i
                 explicit_waitforcert = true
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 4552fd0b8..51c714b15 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -95,7 +95,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -152,7 +152,7 @@ begin
             when "--verbose"
                 options[:verbose] = true
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
diff --git a/bin/puppetrun b/bin/puppetrun
index cd6b493b9..1aa0b295b 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -199,7 +199,7 @@ flags = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(flags)
+Puppet.settings.addargs(flags)
 
 result = GetoptLong.new(*flags)
 
@@ -259,7 +259,7 @@ begin
             when "--debug"
                 options[:debug] = true
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -278,7 +278,7 @@ config = File.join(Puppet[:confdir], "puppetmasterd.conf")
 Puppet.parse_config(config)
 
 if File.exists? config
-    Puppet.config.parse(config)
+    Puppet.settings.parse(config)
 end
 
 if Puppet[:ldapnodes]
diff --git a/bin/ralsh b/bin/ralsh
index 7985f3995..7bf0bd3d7 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -99,7 +99,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -139,7 +139,7 @@ result.each { |opt,arg|
         debug = true
     else
         # Anything else is handled by the config stuff
-        Puppet.config.handlearg(opt, arg)
+        Puppet.settings.handlearg(opt, arg)
     end
 }