aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/resolver
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-22 18:53:21 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-22 18:53:21 +0000
commite8e18cff7a7f61e4cf3ee390e1d6da31ecb9a9e4 (patch)
tree11423007aa0b1cde32fe3c95086772967810b20e /lib/rubygems/resolver
parent0a5fc9c35fb0325ac7ee9b9eae65408b17f7add9 (diff)
downloadruby-e8e18cff7a7f61e4cf3ee390e1d6da31ecb9a9e4.tar.gz
* lib/rubygems: Update to RubyGems master dcce4ff. Important changes
in this commit: Remove automatic detection of gem dependencies files. This prevents a security hole as described in [ruby-core:58490] Fixed bugs for installing git gems. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver')
-rw-r--r--lib/rubygems/resolver/composed_set.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb
index 702bd9ccfc..19227e095b 100644
--- a/lib/rubygems/resolver/composed_set.rb
+++ b/lib/rubygems/resolver/composed_set.rb
@@ -23,9 +23,9 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
# Finds all specs matching +req+ in all sets.
def find_all req
- res = []
- @sets.each { |s| res += s.find_all(req) }
- res
+ @sets.map do |s|
+ s.find_all req
+ end.flatten
end
##