diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-19 06:16:19 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-19 06:16:19 +0000 |
commit | 5f6715275e703ab49666a0440e6fcbb92a24c32f (patch) | |
tree | a998b4d6bf4f1dd3ef2b84adef8971eb78643ae2 /lib/rubygems/specification.rb | |
parent | 9c065a4bfb96d9d482b54e7831e26d01ace77b0d (diff) | |
download | ruby-5f6715275e703ab49666a0440e6fcbb92a24c32f.tar.gz |
* lib/rubygems: Update to RubyGems 2.5.0+ HEAD(c6b4946).
this version includes #1114, #1314, #1322, #1375, #1383, #1387
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/specification.rb')
-rw-r--r-- | lib/rubygems/specification.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 750cc1056f..1be285e4ef 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -2593,6 +2593,7 @@ class Gem::Specification < Gem::BasicSpecification trail.push(self) begin dependencies.each do |dep| + next unless dep.runtime? dep.to_specs.reverse_each do |dep_spec| next if visited.has_key?(dep_spec) visited[dep_spec] = true @@ -2744,7 +2745,7 @@ class Gem::Specification < Gem::BasicSpecification "each license must be 64 characters or less" end - if !Gem::Licenses::IDENTIFIERS.include?(license) && !license.eql?(Gem::Licenses::NONSTANDARD) + if !Gem::Licenses.match?(license) warning <<-warning WARNING: license value '#{license}' is invalid. Use a license identifier from http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license. |