diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-25 19:14:49 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-25 19:14:49 +0000 |
| commit | 04817ae6d3e1d898d6fbf09ad146850d26d2b404 (patch) | |
| tree | 7e5482d13830cacf363d21a087b490588a960095 /lib/rubygems/resolver/conflict.rb | |
| parent | c107372597586e1ad0fea03c00a14bdd7205b5d8 (diff) | |
| download | ruby-04817ae6d3e1d898d6fbf09ad146850d26d2b404.tar.gz | |
* lib/rubygems: Update to RubyGems master 612f85a. Notable changes:
Fixed installation and activation of git: and path: gems via
Gem.use_gemdeps
Improved documentation coverage
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/conflict.rb')
| -rw-r--r-- | lib/rubygems/resolver/conflict.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb index 20c6eced31..8830e8d1fb 100644 --- a/lib/rubygems/resolver/conflict.rb +++ b/lib/rubygems/resolver/conflict.rb @@ -95,7 +95,6 @@ class Gem::Resolver::Conflict path = [] while current do - spec_name = current.spec.full_name requirement = current.request.dependency.requirement path << "#{current.spec.full_name} (#{requirement})" |