summaryrefslogtreecommitdiffstats
path: root/lib/puppet/feature/rails.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/feature/rails.rb')
-rw-r--r--lib/puppet/feature/rails.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 561863c9f..bdff7893c 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,11 +28,13 @@ Puppet.features.add(:rails) do
end
end
- unless defined?(::ActiveRecord) and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
- Puppet.err "ActiveRecord 2.3 required for StoreConfigs"
- raise "ActiveRecord 2.3 required for StoreConfigs"
+ if ! (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
+ false
+ elsif ! ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR == 3
+ Puppet.info "ActiveRecord 2.3 required for StoreConfigs"
+ false
+ else
+ true
end
-
- true
end