diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-05-17 23:42:22 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-05-17 23:42:22 +0000 |
| commit | 89ce72ff802b5dcfbbc01aa9818e3eb4a869bfa8 (patch) | |
| tree | 59870b71c5885030abdf776d6a5d2f650dde71c9 | |
| parent | dc3a6d5a8a30047e3136786a8841869b7e35b422 (diff) | |
| download | puppet-89ce72ff802b5dcfbbc01aa9818e3eb4a869bfa8.tar.gz puppet-89ce72ff802b5dcfbbc01aa9818e3eb4a869bfa8.tar.xz puppet-89ce72ff802b5dcfbbc01aa9818e3eb4a869bfa8.zip | |
fixing stupid debian rails mistake
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1205 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet/rails.rb | 23 |
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 |