summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphan Gorget <gorget@ocre.cea.fr>2009-06-04 11:17:55 +0200
committerJames Turnbull <james@lovedthanlost.net>2009-06-05 07:58:49 +1000
commit7b0413e59ed0d4391a5ff54fb3cd08f0d005c26d (patch)
treeb342fd2c5629aa4aab6d27a99d856faf72102576
parent48d5e8c61cdd0e5e777bbac3adb71d06c109f0da (diff)
downloadpuppet-7b0413e59ed0d4391a5ff54fb3cd08f0d005c26d.tar.gz
puppet-7b0413e59ed0d4391a5ff54fb3cd08f0d005c26d.tar.xz
puppet-7b0413e59ed0d4391a5ff54fb3cd08f0d005c26d.zip
Fixes Bug #2324 - Puppetd fails to start without rails
Signed-off-by: Stéphan Gorget <gorget@ocre.cea.fr>
-rw-r--r--lib/puppet/feature/rails.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index b4c09a2ee..533f9ce7c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -26,7 +26,7 @@ Puppet.features.add(:rails) do
end
if ! (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
- true
+ false
elsif ! (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR >= 1)
Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs"
false