diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-30 02:35:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-30 02:35:24 +0200 |
| commit | ccd45618ed9a629c9535a5ff84ef5c238befa4ab (patch) | |
| tree | 0a582bf695dce01240762d2b8516efde43bc3515 /railties/lib/rails/script_rails_loader.rb | |
| parent | 3c3ff1377d17b584dd14d85c7cecab59ddff2679 (diff) | |
| parent | 755af497555fde16db86f7e51f6462b0aca79b49 (diff) | |
| download | rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.tar.gz rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.tar.bz2 rails-ccd45618ed9a629c9535a5ff84ef5c238befa4ab.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/script_rails_loader.rb')
| -rw-r--r-- | railties/lib/rails/script_rails_loader.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/script_rails_loader.rb b/railties/lib/rails/script_rails_loader.rb index 8fbd3bf492..91672e5d81 100644 --- a/railties/lib/rails/script_rails_loader.rb +++ b/railties/lib/rails/script_rails_loader.rb @@ -7,6 +7,7 @@ module Rails def self.exec_script_rails! cwd = Dir.pwd + return unless in_rails_application? || in_rails_application_subdirectory? exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application? Dir.chdir("..") do # Recurse in a chdir block: if the search fails we want to be sure @@ -18,7 +19,7 @@ module Rails end def self.in_rails_application? - File.exists?(SCRIPT_RAILS) || in_rails_application_subdirectory? + File.exists?(SCRIPT_RAILS) end def self.in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd)) |