diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-30 00:54:12 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-30 00:54:12 +0000 |
| commit | e00d5437d1453f0ec4fbc980a81c15630624eb71 (patch) | |
| tree | 07c1340a8c4ea3d0b7ae2f209866af85de089f27 /lib/rubygems/platform.rb | |
| parent | f363bbdf1042562e40aaccbd1bdd7b783c096ff0 (diff) | |
* 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
Diffstat (limited to 'lib/rubygems/platform.rb')
| -rw-r--r-- | lib/rubygems/platform.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 10d699d6b9..487d245a01 100644 --- a/lib/rubygems/platform.rb +++ b/lib/rubygems/platform.rb @@ -148,8 +148,8 @@ class Gem::Platform return nil unless Gem::Platform === other # cpu - (@cpu == 'universal' or other.cpu == 'universal' or @cpu == other.cpu or - (@cpu == 'arm' and other.cpu =~ /\Aarm/)) and + ([nil,'universal'].include?(@cpu) or [nil, 'universal'].include?(other.cpu) or @cpu == other.cpu or + (@cpu == 'arm' and other.cpu =~ /\Aarm/)) and # os @os == other.os and |