diff options
| author | Matt Jones <al2o3cr@gmail.com> | 2009-03-01 11:53:58 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-01 11:53:58 +0000 |
| commit | a3ac1e1621506a6519b265ef6ec6abc70f6c8a27 (patch) | |
| tree | 21770cd0ac52bfb034da9195b412236ddb893176 /railties/lib/tasks | |
| parent | 3b169cd693f45911ee71e26708fb9267811c8d83 (diff) | |
| download | rails-a3ac1e1621506a6519b265ef6ec6abc70f6c8a27.tar.gz rails-a3ac1e1621506a6519b265ef6ec6abc70f6c8a27.tar.bz2 rails-a3ac1e1621506a6519b265ef6ec6abc70f6c8a27.zip | |
Display gem dependencies correctly and unpack exactly once [#2097 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'railties/lib/tasks')
| -rw-r--r-- | railties/lib/tasks/gems.rake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index d538e52ca6..0932ba73b5 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -47,8 +47,8 @@ namespace :gems do require 'rubygems' require 'rubygems/gem_runner' Rails.configuration.gems.each do |gem| - next unless !gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name) - gem.unpack_to(Rails::GemDependency.unpacked_path) if gem.loaded? + next unless ENV['GEM'].blank? || ENV['GEM'] == gem.name + gem.unpack_to(Rails::GemDependency.unpacked_path) end end @@ -59,8 +59,7 @@ namespace :gems do require 'rubygems/gem_runner' Rails.configuration.gems.each do |gem| next unless ENV['GEM'].blank? || ENV['GEM'] == gem.name - gem.dependencies.each do |dependency| - next if dependency.frozen? + gem.dependencies(:flatten => true).each do |dependency| dependency.unpack_to(Rails::GemDependency.unpacked_path) end end |