[PATCH/puppet 1/1] Fixes Bug #2324 - Puppetd fails to start without rails

[Stéphan Gorget]

Signed-off-by: Stéphan Gorget <gor...@ocre.cea.fr>
---
lib/puppet/feature/rails.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index b4c09a2..533f9ce 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
--
1.6.2.2

[Stephan Gorget]

The patch is available at
http://github.com/phantez/puppet/tree/tickets/master/2324

--
Stéphan Gorget

Stéphan Gorget a écrit :

[Luke Kanies]

Nice miss on my part. :/

+1

--
Good judgment comes from experience, and experience comes from bad
judgment. --Barry LePatner
---------------------------------------------------------------------
Luke Kanies | http://reductivelabs.com | http://madstop.com