diff options
| author | rick <technoweenie@gmail.com> | 2008-06-08 14:04:04 -0400 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-08 14:04:04 -0400 |
| commit | faad1e32a8ab81890018ba89d191607778830cf0 (patch) | |
| tree | a7d07b839fae5004fac164cdceb9d76b9a568af2 /railties/lib/rails/gem_dependency.rb | |
| parent | 138adbf156905f5cc6669ba33dd94802c82514d9 (diff) | |
| download | rails-faad1e32a8ab81890018ba89d191607778830cf0.tar.gz rails-faad1e32a8ab81890018ba89d191607778830cf0.tar.bz2 rails-faad1e32a8ab81890018ba89d191607778830cf0.zip | |
Fix discrepancies with loading rails/init.rb from gems. [#324 state:resolved]
Diffstat (limited to 'railties/lib/rails/gem_dependency.rb')
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 4cac7f725a..f8d97840c1 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -23,9 +23,13 @@ module Rails @unpack_directory = nil end + def unpacked_paths + Dir[File.join(self.class.unpacked_path, "#{@name}-#{@version || "*"}")] + end + def add_load_paths return if @loaded || @load_paths_added - unpacked_paths = Dir[File.join(self.class.unpacked_path, "#{@name}-#{@version || "*"}")] + unpacked_paths = self.unpacked_paths if unpacked_paths.empty? args = [@name] args << @requirement.to_s if @requirement |