mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
rubygems 2.6.7
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update
rubygems to 2.6.7.
Release note of 2.6.7: 60f35bd1d2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cc00f5bf36
commit
69934aeb8d
31 changed files with 511 additions and 161 deletions
|
@ -1,5 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
module Gem::Resolver::Molinillo
|
||||
# The version of Gem::Resolver::Molinillo.
|
||||
VERSION = '0.5.0'.freeze
|
||||
VERSION = '0.5.1'.freeze
|
||||
end
|
||||
|
|
|
@ -184,6 +184,8 @@ module Gem::Resolver::Molinillo
|
|||
raise VersionConflict.new(c) unless state
|
||||
activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
|
||||
state.conflicts = c
|
||||
index = states.size - 1
|
||||
@parent_of.reject! { |_, i| i >= index }
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -209,7 +211,10 @@ module Gem::Resolver::Molinillo
|
|||
# @return [Object] the requirement that led to `requirement` being added
|
||||
# to the list of requirements.
|
||||
def parent_of(requirement)
|
||||
@parent_of[requirement]
|
||||
return unless requirement
|
||||
return unless index = @parent_of[requirement]
|
||||
return unless parent_state = @states[index]
|
||||
parent_state.requirement
|
||||
end
|
||||
|
||||
# @return [Object] the requirement that led to a version of a possibility
|
||||
|
@ -418,7 +423,8 @@ module Gem::Resolver::Molinillo
|
|||
debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
|
||||
nested_dependencies.each do |d|
|
||||
activated.add_child_vertex(name_for(d), nil, [name_for(activated_spec)], d)
|
||||
@parent_of[d] = requirement
|
||||
parent_index = states.size - 1
|
||||
@parent_of[d] ||= parent_index
|
||||
end
|
||||
|
||||
push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue