diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-13 01:40:42 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-13 01:40:42 +0000 |
| commit | fdb6a621b0bde5dec6b4541569a95fb2f16261a3 (patch) | |
| tree | c9e5506f6f6cc62d33bb90c9b1b933e374c68d4e /lib/rubygems/dependency_resolver.rb | |
| parent | e6a317bf6c4f988fe005af271c1d40ddc9c1ae59 (diff) | |
| download | ruby-fdb6a621b0bde5dec6b4541569a95fb2f16261a3.tar.gz | |
* 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
Diffstat (limited to 'lib/rubygems/dependency_resolver.rb')
| -rw-r--r-- | lib/rubygems/dependency_resolver.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/rubygems/dependency_resolver.rb b/lib/rubygems/dependency_resolver.rb index 721fd43c51..abce692920 100644 --- a/lib/rubygems/dependency_resolver.rb +++ b/lib/rubygems/dependency_resolver.rb @@ -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' |