archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge RubyGems-3.2.13 and Bundler-2.2.13

Browse source
This commit is contained in:
Hiroshi SHIBATA 2021-03-08 12:17:52 +09:00 • committed by NARUSE, Yui
parent 06cd5711e0
commit 7efc7afcae
24 changed files with 477 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/rubygems/platform.rb
View file

@ -66,7 +66,7 @@ class Gem::Platform
when String then
arch = arch.split '-'
if arch.length > 2 and arch.last !~ /\d/ # reassemble x86-linux-gnu
if arch.length > 2 and arch.last !~ /\d+(\.\d+)?$/ # reassemble x86-linux-{libc}
extra = arch.pop
arch.last << "-#{extra}"
end
@ -146,7 +146,8 @@ class Gem::Platform
##
# Does +other+ match this platform? Two platforms match if they have the
# same CPU, or either has a CPU of 'universal', they have the same OS, and
# they have the same version, or either has no version.
# they have the same version, or either has no version (except for 'linux'
# where the version is the libc name, with no version standing for 'gnu')
#
# Additionally, the platform will match if the local CPU is 'arm' and the
# other CPU starts with "arm" (for generic ARM family support).
@ -162,7 +163,10 @@ class Gem::Platform
@os == other.os and
# version
(@version.nil? or other.version.nil? or @version == other.version)
(
(@os != 'linux' and (@version.nil? or other.version.nil?)) or
@version == other.version
)
end
##