mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems: Update to RubyGems 2.1.3
Fixed installing platform gems Restored concurrent requires Fixed installing gems with extensions with --install-dir Fixed `gem fetch -v` to install the latest version Fixed installing gems with "./" in their files entries * test/rubygems/test_gem_package.rb: Tests for the above. * NEWS: Updated for RubyGems 2.1.3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e6a317bf6c
commit
fdb6a621b0
13 changed files with 211 additions and 74 deletions
|
@ -131,8 +131,9 @@ class Gem::DependencyResolver
|
|||
return conflict
|
||||
end
|
||||
|
||||
# Get a list of all specs that satisfy dep
|
||||
# Get a list of all specs that satisfy dep and platform
|
||||
possible = @set.find_all dep
|
||||
possible = select_local_platforms possible
|
||||
|
||||
case possible.size
|
||||
when 0
|
||||
|
@ -228,6 +229,15 @@ class Gem::DependencyResolver
|
|||
specs
|
||||
end
|
||||
|
||||
##
|
||||
# Returns the gems in +specs+ that match the local platform.
|
||||
|
||||
def select_local_platforms specs # :nodoc:
|
||||
specs.select do |spec|
|
||||
Gem::Platform.match spec.platform
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
require 'rubygems/dependency_resolver/api_set'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue