diff options
Diffstat (limited to 'lib/puppet/feature/rails.rb')
| -rw-r--r-- | lib/puppet/feature/rails.rb | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb index 05d416edc..e0e14ebeb 100644 --- a/lib/puppet/feature/rails.rb +++ b/lib/puppet/feature/rails.rb @@ -6,30 +6,30 @@ require 'puppet/util/feature' 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 - Dir.entries("/usr/share/rails").each do |dir| - libdir = File.join("/usr/share/rails", dir, "lib") - if FileTest.exists?(libdir) and ! $LOAD_PATH.include?(libdir) - count += 1 - $LOAD_PATH << libdir - end - end - - retry if count > 0 + begin + require 'active_record' + require 'active_record/version' + rescue LoadError => detail + if FileTest.exists?("/usr/share/rails") + count = 0 + Dir.entries("/usr/share/rails").each do |dir| + libdir = File.join("/usr/share/rails", dir, "lib") + if FileTest.exists?(libdir) and ! $LOAD_PATH.include?(libdir) + count += 1 + $LOAD_PATH << libdir end - end + end - 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 >= 1) - Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs" - false - else - true + retry if count > 0 end + end + + 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 >= 1) + Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs" + false + else + true + end end |