1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/rubygems: Update to RubyGems HEAD(c202db2).

this version contains many enhancements see http://git.io/vtNwF
* test/rubygems: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-07-01 21:50:14 +00:00
parent 9c4ef4b191
commit effdbf5936
90 changed files with 2489 additions and 1159 deletions

View file

@ -66,7 +66,7 @@ module Kernel
begin
RUBYGEMS_ACTIVATION_MONITOR.exit
return gem_original_require(spec.to_fullpath(path) || path)
return gem_original_require(path)
end if spec
# Attempt to find +path+ in any unresolved gems...
@ -105,7 +105,7 @@ module Kernel
# Ok, now find a gem that has no conflicts, starting
# at the highest version.
valid = found_specs.select { |s| s.conflicts.empty? }.last
valid = found_specs.reject { |s| s.has_conflicts? }.last
unless valid then
le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"