mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
[rubygems/rubygems] Remove unnecessary endless loop detection
Fixes a TODO now that no reports have been reported in a while.
f10dc84e7b
This commit is contained in:
parent
862b30287a
commit
e2fbd01714
1 changed files with 1 additions and 9 deletions
|
@ -645,20 +645,12 @@ module Bundler
|
||||||
end
|
end
|
||||||
|
|
||||||
def materialize(dependencies)
|
def materialize(dependencies)
|
||||||
# Tracks potential endless loops trying to re-resolve.
|
|
||||||
# TODO: Remove as dead code if not reports are received in a while
|
|
||||||
incorrect_spec = nil
|
|
||||||
|
|
||||||
specs = begin
|
specs = begin
|
||||||
resolve.materialize(dependencies)
|
resolve.materialize(dependencies)
|
||||||
rescue IncorrectLockfileDependencies => e
|
rescue IncorrectLockfileDependencies => e
|
||||||
raise if Bundler.frozen_bundle?
|
raise if Bundler.frozen_bundle?
|
||||||
|
|
||||||
spec = e.spec
|
reresolve_without([e.spec])
|
||||||
raise "Infinite loop while fixing lockfile dependencies" if incorrect_spec == spec
|
|
||||||
|
|
||||||
incorrect_spec = spec
|
|
||||||
reresolve_without([spec])
|
|
||||||
retry
|
retry
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue