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

Merge rubygems master.

Browse source 
This is RC version of Rubygems 2.7.0.
  688fb7e83c

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2017-10-08 01:32:18 +00:00
parent 6b05153a3a
commit c00e84327f
96 changed files with 2021 additions and 701 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/rubygems/resolver/installer_set.rb
View file

@ -41,6 +41,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
@ignore_dependencies = false
@ignore_installed = false
@local = {}
@local_source = Gem::Source::Local.new
@remote_set = Gem::Resolver::BestSet.new
@specs = {}
end
@ -136,13 +137,11 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
res.concat matching_local
local_source = Gem::Source::Local.new
begin
if local_spec = local_source.find_gem(name, dep.requirement) then
if local_spec = @local_source.find_gem(name, dep.requirement) then
res << Gem::Resolver::IndexSpecification.new(
self, local_spec.name, local_spec.version,
local_source, local_spec.platform)
@local_source, local_spec.platform)
end
rescue Gem::Package::FormatError
# ignore
@ -194,7 +193,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
# Has a local gem for +dep_name+ been added to this set?
def local? dep_name # :nodoc:
spec, = @local[dep_name]
spec, _ = @local[dep_name]
spec
end
@ -226,4 +225,3 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
end
end