diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-08 01:32:18 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-08 01:32:18 +0000 |
| commit | c00e84327f14845bd484e76b5ee5dfeb1fa9ce3d (patch) | |
| tree | 9f558dafa363f4f0118d504a50cd4461e2821cd1 /lib/rubygems/resolver | |
| parent | 6b05153a3a75b74b64553d6a46f501d9ee0f0376 (diff) | |
Merge rubygems master.
This is RC version of Rubygems 2.7.0.
https://github.com/rubygems/rubygems/commit/688fb7e83c13c3fe7c2bb03c49a2db4c82852aee
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver')
| -rw-r--r-- | lib/rubygems/resolver/installer_set.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb index 07fffeb150..f24293c0a0 100644 --- a/lib/rubygems/resolver/installer_set.rb +++ b/lib/rubygems/resolver/installer_set.rb @@ -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 - |