diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 00:14:16 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 00:14:16 +0000 |
commit | 28918eac58eb6e2681d10839ac0d1430b2a4f1f9 (patch) | |
tree | 3c2c9e36118efe1d9406acdd14c186788879bea3 /lib/rubygems/commands | |
parent | cfe1458078b8cf36e490c516977c52e1faa9e88a (diff) |
* lib/rubygems: Update to RubyGems master commit 2a74263. This fixes
several bugs in RubyGems 2.2.0.preview.1.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/commands')
-rw-r--r-- | lib/rubygems/commands/query_command.rb | 4 | ||||
-rw-r--r-- | lib/rubygems/commands/sources_command.rb | 3 | ||||
-rw-r--r-- | lib/rubygems/commands/update_command.rb | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index 55b950c1b7..432250e033 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -161,11 +161,11 @@ is too hard to use. :latest end - if options[:name].source.empty? + if name.source.empty? spec_tuples = fetcher.detect(type) { true } else spec_tuples = fetcher.detect(type) do |name_tuple| - options[:name] === name_tuple.name + name === name_tuple.name end end diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb index 60d96c5828..81ff07babc 100644 --- a/lib/rubygems/commands/sources_command.rb +++ b/lib/rubygems/commands/sources_command.rb @@ -154,8 +154,7 @@ To remove a source use the --remove argument: end def list? # :nodoc: - !(options[:list] || - options[:add] || + !(options[:add] || options[:clear_all] || options[:remove] || options[:update]) diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb index 401698196d..7d7371818f 100644 --- a/lib/rubygems/commands/update_command.rb +++ b/lib/rubygems/commands/update_command.rb @@ -110,7 +110,9 @@ command to remove old versions. fetcher = Gem::SpecFetcher.fetcher - spec_tuples, _ = fetcher.search_for_dependency dependency + spec_tuples, errors = fetcher.search_for_dependency dependency + + raise errors.first unless errors.empty? spec_tuples end |