diff options
Diffstat (limited to 'lib/rubygems/commands/query_command.rb')
| -rw-r--r-- | lib/rubygems/commands/query_command.rb | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index 65258fd1ac..29e53065e7 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_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/spec_fetcher' @@ -108,31 +114,11 @@ class Gem::Commands::QueryCommand < Gem::Command all = options[:all] - begin - fetcher = Gem::SpecFetcher.fetcher - spec_tuples = fetcher.find_matching dep, all, false, prerelease - - spec_tuples += fetcher.find_matching dep, false, false, true if - prerelease and all - rescue Gem::RemoteFetcher::FetchError => e - if prerelease then - raise Gem::OperationNotSupportedError, - "Prereleases not supported on legacy repositories" - end - - raise unless fetcher.warn_legacy e do - require 'rubygems/source_info_cache' - - dep.name = '' if dep.name == // + fetcher = Gem::SpecFetcher.fetcher + spec_tuples = fetcher.find_matching dep, all, false, prerelease - specs = Gem::SourceInfoCache.search_with_source dep, false, all - - spec_tuples = specs.map do |spec, source_uri| - [[spec.name, spec.version, spec.original_platform, spec], - source_uri] - end - end - end + spec_tuples += fetcher.find_matching dep, false, false, true if + prerelease and all output_query_results spec_tuples end |