[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit e0488b26f04e931b17b104fd7f69f6527436e81d
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Wed Dec 16 14:29:40 2009 -0800

    Fix #2808 puppetqd doesn't give an error when no config is given
    
    Added an info message about what database we're connecting to.
    In the case of the default database, it looks like:
    
    info: Connecting to sqlite3 database: /var/lib/puppet/state/clientconfigs.sqlite3
    
    Also squashes the deprecation warning #2941, since fixing that makes
    this patch smaller.

diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 87f1bb1..98d8297 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -29,7 +29,9 @@ module Puppet::Rails
         ActiveRecord::Base.verify_active_connections!
 
         begin
-            ActiveRecord::Base.establish_connection(database_arguments())
+            args = database_arguments
+            Puppet.info "Connecting to #{args[:adapter]} database: #{args[:database]}"
+            ActiveRecord::Base.establish_connection(args)
         rescue => detail
             if Puppet[:trace]
                 puts detail.backtrace
@@ -46,7 +48,7 @@ module Puppet::Rails
 
         case adapter
         when "sqlite3"
-            args[:dbfile] = Puppet[:dblocation]
+            args[:database] = Puppet[:dblocation]
         when "mysql", "postgresql"
             args[:host]     = Puppet[:dbserver] unless Puppet[:dbserver].empty?
             args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty?

-- 
Puppet packaging for Debian