diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-19 00:08:49 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-19 00:08:49 +0000 |
| commit | e798ccbacf489a3af2201ae30058ff0ae7f79045 (patch) | |
| tree | 4147a7834eb88323057fd2120a2ddc96c1eb32ab /lib/rubygems/commands/dependency_command.rb | |
| parent | d26fb035cae8d351dc238376722c980230dc5fbd (diff) | |
| download | ruby-e798ccbacf489a3af2201ae30058ff0ae7f79045.tar.gz | |
Import rubygems 1.5.0 (release candidate)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/commands/dependency_command.rb')
| -rw-r--r-- | lib/rubygems/commands/dependency_command.rb | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb index 649e3c2d2d..98d6b42893 100644 --- a/lib/rubygems/commands/dependency_command.rb +++ b/lib/rubygems/commands/dependency_command.rb @@ -1,3 +1,9 @@ +###################################################################### +# This file is imported from the rubygems project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis or Eric Hodel. +###################################################################### + require 'rubygems/command' require 'rubygems/local_remote_options' require 'rubygems/version_option' @@ -76,25 +82,13 @@ class Gem::Commands::DependencyCommand < Gem::Command if remote? and not options[:reverse_dependencies] then fetcher = Gem::SpecFetcher.fetcher - begin - specs_and_sources = fetcher.find_matching(dependency, false, true, - dependency.prerelease?) - - specs_and_sources.each do |spec_tuple, source_uri| - spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri) - - source_indexes[source_uri].add_spec spec - end - rescue Gem::RemoteFetcher::FetchError => e - raise unless fetcher.warn_legacy e do - require 'rubygems/source_info_cache' + specs_and_sources = fetcher.find_matching(dependency, false, true, + dependency.prerelease?) - specs = Gem::SourceInfoCache.search_with_source dependency, false + specs_and_sources.each do |spec_tuple, source_uri| + spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri) - specs.each do |spec, source_uri| - source_indexes[source_uri].add_spec spec - end - end + source_indexes[source_uri].add_spec spec end end |