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 | 5a90f9e8f84533e7859232895fc4bbe6b31cc771 (patch) | |
| tree | e15086587f691a1f5bd3c7ddbfa38e825828caf6 /lib/rubygems/dependency.rb | |
| parent | f1321bd6e7c2d6b6a29a67074bad6f2742263921 (diff) | |
| download | ruby-5a90f9e8f84533e7859232895fc4bbe6b31cc771.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/dependency.rb')
| -rw-r--r-- | lib/rubygems/dependency.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb index c7b2451c6a..bf24b6e724 100644 --- a/lib/rubygems/dependency.rb +++ b/lib/rubygems/dependency.rb @@ -275,8 +275,9 @@ class Gem::Dependency end def matching_specs platform_only = false + env_req = Gem.env_requirement(name) matches = Gem::Specification.stubs_for(name).find_all { |spec| - requirement.satisfied_by? spec.version + requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version) }.map(&:to_spec) if platform_only |