[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 871e6fd58223cad241bcc14f165b3ab1e6e257e6
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Jul 28 08:15:21 2010 +1000

    Fixed #4368 - Updated clean stored configs ext script for new config sections

diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
index 34dd72f..9b7b0c8 100644
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@ -19,11 +19,11 @@ end
 
 
       opts = GetoptLong.new(
-                
+
     [ "--config",     "-c",   GetoptLong::REQUIRED_ARGUMENT ],
     [ "--help",        "-h",   GetoptLong::NO_ARGUMENT ],
     [ "--usage",       "-u",   GetoptLong::NO_ARGUMENT ],
-        
+
     [ "--version",     "-v",   GetoptLong::NO_ARGUMENT ]
 )
 
@@ -54,7 +54,7 @@ printusage(1) unless ARGV.size > 0
 require 'puppet/rails'
 Puppet[:config] = config
 Puppet.parse_config
-pm_conf = Puppet.settings.instance_variable_get(:@values)[:puppetmasterd]
+pm_conf = Puppet.settings.instance_variable_get(:@values)[:master]
 
 adapter = pm_conf[:dbadapter]
 args = {:adapter => adapter, :log_level => pm_conf[:rails_loglevel]}

-- 
Puppet packaging for Debian