diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-20 00:31:12 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-20 00:31:12 +0000 |
| commit | 8552f7aa680e1f1a31d76dc9038d80248a445960 (patch) | |
| tree | 29de125ca8389a65e44d42b269a19274b8846b11 /lib/rubygems/dependency_resolver.rb | |
| parent | 347e748bddd42e5a39dcb5c55ac37704a14b9374 (diff) | |
| download | ruby-8552f7aa680e1f1a31d76dc9038d80248a445960.tar.gz | |
* lib/rubygems: Update to RubyGems master 3de7e0f. Changes:
Only attempt to build extensions for newly-installed gems. This
prevents compilation attempts at gem activation time for gems that
already have extensions built.
Fix crash in the dependency resolver for dependencies that cannot be
resolved.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_resolver.rb')
| -rw-r--r-- | lib/rubygems/dependency_resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems/dependency_resolver.rb b/lib/rubygems/dependency_resolver.rb index 2b3cc1aa34..10cecf7972 100644 --- a/lib/rubygems/dependency_resolver.rb +++ b/lib/rubygems/dependency_resolver.rb @@ -125,7 +125,7 @@ class Gem::DependencyResolver # If the existing activation indicates that there are other possibles for # it, then issue the conflict on the dependency for the activation itself. # Otherwise, issue it on the requester's request itself. - if existing.others_possible? + if existing.others_possible? or existing.request.requester.nil? then conflict = Gem::DependencyResolver::DependencyConflict.new dep, existing else |