diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-26 02:06:00 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-26 02:06:00 +0000 |
commit | 8b424513fd43c398aaeea5dede8bbc5c51602773 (patch) | |
tree | b1509d7a77a52206f7825520c99a693f7818a8a4 /lib/rubygems/dependency_installer.rb | |
parent | dbf3fb3d8e6e10e2ac2af19937e0016a4815ca50 (diff) |
Upgrade to RubyGems 1.2.0 r1824. Incorporates [ruby-core:17353].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_installer.rb')
-rw-r--r-- | lib/rubygems/dependency_installer.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index 8636599fbc..8406844e79 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -133,7 +133,9 @@ class Gem::DependencyInstaller deps.each do |dep| results = find_gems_with_sources(dep).reverse - results.reject! do + results.reject! do |dep_spec,| + to_do.push dep_spec + @source_index.any? do |_, installed_spec| dep.name == installed_spec.name and dep.version_requirements.satisfied_by? installed_spec.version @@ -144,7 +146,6 @@ class Gem::DependencyInstaller next if seen[dep_spec.name] @specs_and_sources << [dep_spec, source_uri] dependency_list.add dep_spec - to_do.push dep_spec end end end |