summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/rails.rb23
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index d035968eb..8b2a2f99d 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -6,19 +6,20 @@ require 'puppet'
begin
require 'active_record'
rescue LoadError => detail
- if Facter["operatingsystem"].value == "Debian"
- count = 0
- Dir.entries("/usr/share/rails").each do |dir|
- libdir = File.join("/usr/share/rails", dir, "lib")
- if FileTest.exists?(libdir) and ! $:.include?(libdir)
- count += 1
- $: << libdir
+ if Facter["operatingsystem"].value == "Debian" and
+ 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 ! $:.include?(libdir)
+ count += 1
+ $: << libdir
+ end
end
- end
- if count > 0
- retry
- end
+ if count > 0
+ retry
+ end
end
end