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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 7978be59090b0bb25c2bc29ecb16ade33a8f50f6
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Tue Jul 6 17:00:18 2010 -0700

    [#3906] Fixed missing constant Puppet::Rails when using storeconfigs
    
    The hook for storeconfig will now require 'puppet/rails' if the setting
    is set to true. It was previously being indirectly required via
    parser/interpreter, which was removed.

diff --git a/lib/puppet.rb b/lib/puppet.rb
index b5c4806..fbf5ccf 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -168,8 +168,3 @@ require 'puppet/module'
 require 'puppet/util/storage'
 require 'puppet/status'
 require 'puppet/file_bucket/file'
-
-if Puppet[:storeconfigs]
-    require 'puppet/rails'
-end
-
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index ed06231..6ded3c0 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -763,6 +763,7 @@ module Puppet
                 require 'puppet/node'
                 require 'puppet/node/facts'
                 if value
+                    require 'puppet/rails'
                     raise "StoreConfigs not supported without ActiveRecord 2.1 or higher" unless Puppet.features.rails?
                     Puppet::Resource::Catalog.cache_class = :active_record unless Puppet.settings[:async_storeconfigs]
                     Puppet::Node::Facts.cache_class = :active_record

-- 
Puppet packaging for Debian