diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-18 21:56:18 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-18 21:56:18 +0000 |
| commit | 08aa6d59a2bc35556125d373f90f5286440c6f84 (patch) | |
| tree | 532694033c6b495c4355b9f35a1a8b60497ad103 /lib/rubygems/request_set.rb | |
| parent | 9f9b47671052072a305275b99d7e132cf17fbc79 (diff) | |
| download | ruby-08aa6d59a2bc35556125d373f90f5286440c6f84.tar.gz | |
* lib/rubygems: Update to RubyGems master 0a3814b. Changes:
Fixed extension directory in Gem::Specification#require_paths.
Allow installation of gems when $HOME is nonexistent or unwritable.
Use proper API in InstallCommand.
Improve support for path option in gem dependency files.
Remove warnings.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set.rb')
| -rw-r--r-- | lib/rubygems/request_set.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index eb45516cfb..9a7ac83e91 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -159,7 +159,15 @@ class Gem::RequestSet # Resolve the requested dependencies and return an Array of Specification # objects to be activated. - def resolve set = nil + def resolve set = Gem::DependencyResolver::IndexSet.new + sets = [set, @vendor_set].compact + + set = if sets.size == 1 then + sets.first + else + Gem::DependencyResolver.compose_sets(*sets) + end + resolver = Gem::DependencyResolver.new @dependencies, set resolver.development = @development resolver.soft_missing = @soft_missing |