diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 03:30:02 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 03:30:02 +0000 |
commit | 4de117a61517e839f2c45eaf45d56fc243d6d5b2 (patch) | |
tree | 7cb5af7a7eb513e5dddf5e343746b1611e628387 /lib/rubygems/resolver/composed_set.rb | |
parent | e548c09d429a5136285ea81aed418685359ed124 (diff) |
* lib/rubygems: Update to RubyGems 2.4.1 master(713ab65)
Complete history at:
https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/composed_set.rb')
-rw-r--r-- | lib/rubygems/resolver/composed_set.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb index 6f912b0afe..5b08f128ed 100644 --- a/lib/rubygems/resolver/composed_set.rb +++ b/lib/rubygems/resolver/composed_set.rb @@ -22,6 +22,18 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set end ## + # When +allow_prerelease+ is set to +true+ prereleases gems are allowed to + # match dependencies. + + def prerelease= allow_prerelease + super + + sets.each do |set| + set.prerelease = allow_prerelease + end + end + + ## # Sets the remote network access for all composed sets. def remote= remote @@ -30,6 +42,10 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set @sets.each { |set| set.remote = remote } end + def errors + @errors + @sets.map { |set| set.errors }.flatten + end + ## # Finds all specs matching +req+ in all sets. |