summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorshadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-15 22:36:38 +0000
committershadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>2007-02-15 22:36:38 +0000
commit69d4bfe13a579da05a1a02be3880b16bd2a2f1a0 (patch)
tree23d00f2a1013dde5f57f221e69171aff37fbae03 /lib
parent9de665c4dae754740c11a634ef50e90dae823a07 (diff)
downloadpuppet-69d4bfe13a579da05a1a02be3880b16bd2a2f1a0.tar.gz
puppet-69d4bfe13a579da05a1a02be3880b16bd2a2f1a0.tar.xz
puppet-69d4bfe13a579da05a1a02be3880b16bd2a2f1a0.zip
This works for me. Probably not the most universal fix.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2195 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/feature/rails.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 791141d1b..34407de66 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -21,6 +21,10 @@ Puppet.features.add(:rails) do
if count > 0
retry
end
+ else
+ #If ActiveRecord was installed only via rubygems this is required
+ require 'rubygems'
+ require 'active_record'
end
end