mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems: Update to RubyGems HEAD(60d7972).
this version contains pull requests number of #1343, #1356, #1357, #1363 at https://github.com/rubygems/rubygems/pulls * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f363bbdf10
commit
e00d5437d1
14 changed files with 110 additions and 23 deletions
|
@ -280,7 +280,7 @@ class Gem::Dependency
|
|||
|
||||
if platform_only
|
||||
matches.reject! { |spec|
|
||||
not Gem::Platform.match spec.platform
|
||||
spec.nil? || !Gem::Platform.match(spec.platform)
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -326,11 +326,11 @@ class Gem::Dependency
|
|||
def to_spec
|
||||
matches = self.to_specs
|
||||
|
||||
active = matches.find { |spec| spec.activated? }
|
||||
active = matches.find { |spec| spec && spec.activated? }
|
||||
|
||||
return active if active
|
||||
|
||||
matches.delete_if { |spec| spec.version.prerelease? } unless prerelease?
|
||||
matches.delete_if { |spec| spec.nil? || spec.version.prerelease? } unless prerelease?
|
||||
|
||||
matches.last
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue