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/dependency.rb | |
parent | f363bbdf1042562e40aaccbd1bdd7b783c096ff0 (diff) | |
download | ruby-e00d5437d1453f0ec4fbc980a81c15630624eb71.tar.gz |
* 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/dependency.rb')
-rw-r--r-- | lib/rubygems/dependency.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb index b4a6dd8673..da990fa139 100644 --- a/lib/rubygems/dependency.rb +++ b/lib/rubygems/dependency.rb @@ -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 |