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

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 1494bd7e53a87d2cb75a23f78f4178975790199d
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sun Sep 6 20:46:16 2009 -0400

    Require active_record/version to support ActiveRecord < 2.3
    
    ActiveRecord < 2.3.0 did not autoload active_record/version which
    caused puppet to incorrectly believe ActiveRecord was not available.
    This compliments 1a5c5b3 (Fixing #2508 - removing mention of
    ActiveRecord 2.3).
    
    Signed-off-by: Todd Zullinger <tmz at pobox.com>

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index d70be51..87b408c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -8,6 +8,7 @@ Puppet.features.rubygems?
 Puppet.features.add(:rails) do
     begin
         require 'active_record'
+        require 'active_record/version'
     rescue LoadError => detail
         if FileTest.exists?("/usr/share/rails")
             count = 0

-- 
Puppet packaging for Debian