[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit cbb28026b2ece55be06530fb2572cdc7b48f2895
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed May 12 18:27:12 2010 -0700

    Code cleanup: remove "self." from setdefaults
    
    defaults.rb was cluttered with unnessesary "self." decorations.
    I removed them in preparation for a refactor of where settings are
    handled, but that change has been postponed.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index da3aaa3..5ed438d 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -353,7 +353,7 @@ module Puppet
     )
 
     # Define the config default.
-    self.setdefaults(self.settings[:name],
+    setdefaults(Puppet.settings[:name],
         :config => ["$confdir/puppet.conf",
             "The configuration file for #{Puppet[:name]}."],
         :pidfile => ["$rundir/$name.pid", "The pid file"],
@@ -368,7 +368,7 @@ module Puppet
         }
     )
 
-    self.setdefaults(:master,
+    setdefaults(:master,
         :user => ["puppet", "The user puppet master should run as."],
         :group => ["puppet", "The group puppet master should run as."],
         :manifestdir => ["$confdir/manifests",
@@ -594,7 +594,7 @@ module Puppet
     )
 
     # Plugin information.
-    self.setdefaults(:main,
+    setdefaults(:main,
         :plugindest => ["$libdir",
             "Where Puppet should store plugins that it pulls down from the central
             server."],
@@ -609,7 +609,7 @@ module Puppet
     )
 
     # Central fact information.
-    self.setdefaults(:main,
+    setdefaults(:main,
         :factpath => {:default => "$vardir/lib/facter/:$vardir/facts",
             :desc => "Where Puppet should look for facts.  Multiple directories should
                 be colon-separated, like normal PATH variables.",
@@ -629,7 +629,7 @@ module Puppet
             "What files to ignore when pulling down facts."]
     )
 
-    self.setdefaults(:tagmail,
+    setdefaults(:tagmail,
         :tagmap => ["$confdir/tagmail.conf",
             "The mapping between reporting tags and email addresses."],
         :sendmail => [%x{which sendmail 2>/dev/null}.chomp,
@@ -640,7 +640,7 @@ module Puppet
             "The server through which to send email reports."]
     )
 
-    self.setdefaults(:rails,
+    setdefaults(:rails,
         :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
             :mode => 0660,
             :owner => "service",

-- 
Puppet packaging for Debian