diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-19 00:08:49 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-19 00:08:49 +0000 |
| commit | e798ccbacf489a3af2201ae30058ff0ae7f79045 (patch) | |
| tree | 4147a7834eb88323057fd2120a2ddc96c1eb32ab /lib/rubygems/dependency_list.rb | |
| parent | d26fb035cae8d351dc238376722c980230dc5fbd (diff) | |
Import rubygems 1.5.0 (release candidate)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_list.rb')
| -rw-r--r-- | lib/rubygems/dependency_list.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb index 25d469d68c..647bb91ae2 100644 --- a/lib/rubygems/dependency_list.rb +++ b/lib/rubygems/dependency_list.rb @@ -1,3 +1,9 @@ +###################################################################### +# This file is imported from the rubygems project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis or Eric Hodel. +###################################################################### + #-- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others. # All rights reserved. @@ -187,6 +193,7 @@ class Gem::DependencyList begin yield spec rescue TSort::Cyclic + # do nothing end break end @@ -201,13 +208,7 @@ class Gem::DependencyList # +ignored+. def active_count(specs, ignored) - result = 0 - - specs.each do |spec| - result += 1 unless ignored[spec.full_name] - end - - result + specs.count { |spec| ignored[spec.full_name].nil? } end end |