summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2009-09-06 20:46:16 -0400
committerJames Turnbull <james@lovedthanlost.net>2009-09-09 11:23:05 +1000
commit1494bd7e53a87d2cb75a23f78f4178975790199d (patch)
tree5dad8b5c02455a289babc98d7fff29ec9272cd84
parenta5c56fcb79b45568b592111959ebda6b11c4c43e (diff)
downloadpuppet-1494bd7e53a87d2cb75a23f78f4178975790199d.tar.gz
puppet-1494bd7e53a87d2cb75a23f78f4178975790199d.tar.xz
puppet-1494bd7e53a87d2cb75a23f78f4178975790199d.zip
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@pobox.com>
-rw-r--r--lib/puppet/feature/rails.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index d70be5137..87b408c78 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