aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/paths.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-26 16:08:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-26 16:08:33 -0700
commita2a861fcecf40134a4be7735d96896c0d884f670 (patch)
tree77e8a41b30e3bbe207c16ec0f72715c48c32a7c0 /railties/lib/rails/paths.rb
parent33da24a8dbc87953e416eff75a7300ab5fd36905 (diff)
downloadrails-a2a861fcecf40134a4be7735d96896c0d884f670.tar.gz
rails-a2a861fcecf40134a4be7735d96896c0d884f670.tar.bz2
rails-a2a861fcecf40134a4be7735d96896c0d884f670.zip
still need to ensure the path is a directory
Diffstat (limited to 'railties/lib/rails/paths.rb')
-rw-r--r--railties/lib/rails/paths.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 936b91f134..d9c47c0498 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -155,7 +155,7 @@ module Rails
each do |p|
path = File.expand_path(p, @root.path)
- if @glob
+ if @glob && File.directory?(path)
result.concat Dir.chdir(path) {
Dir.glob(@glob).map { |file| File.join path, file }.sort
}