diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-04 00:29:40 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-04 00:29:40 +0000 |
| commit | e373d99f356779c1823c81603eaee6ed71cf68f5 (patch) | |
| tree | e15086587f691a1f5bd3c7ddbfa38e825828caf6 /lib/rubygems/resolver/installer_set.rb | |
| parent | 984ea2cb815c33cfd50eb103a604e1c7462069a2 (diff) | |
| download | ruby-e373d99f356779c1823c81603eaee6ed71cf68f5.tar.gz | |
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.1.
Please see entries of 2.6.0 and 2.6.1 on
https://github.com/rubygems/rubygems/blob/master/History.txt
[fix GH-1270] Patch by @segiddins
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/installer_set.rb')
| -rw-r--r-- | lib/rubygems/resolver/installer_set.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb index 1ed02e6f9f..07fffeb150 100644 --- a/lib/rubygems/resolver/installer_set.rb +++ b/lib/rubygems/resolver/installer_set.rb @@ -138,10 +138,14 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set local_source = Gem::Source::Local.new - 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) + begin + 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) + end + rescue Gem::Package::FormatError + # ignore end end |