Skip to content

Commit e2fbd01

Browse files
deivid-rodriguezhsbt
authored andcommitted
[rubygems/rubygems] Remove unnecessary endless loop detection
Fixes a TODO now that no reports have been reported in a while. ruby/rubygems@f10dc84e7b
1 parent 862b302 commit e2fbd01

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

lib/bundler/definition.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -645,20 +645,12 @@ def filter_specs(specs, deps, skips: [])
645645
end
646646

647647
def materialize(dependencies)
648-
# Tracks potential endless loops trying to re-resolve.
649-
# TODO: Remove as dead code if not reports are received in a while
650-
incorrect_spec = nil
651-
652648
specs = begin
653649
resolve.materialize(dependencies)
654650
rescue IncorrectLockfileDependencies => e
655651
raise if Bundler.frozen_bundle?
656652

657-
spec = e.spec
658-
raise "Infinite loop while fixing lockfile dependencies" if incorrect_spec == spec
659-
660-
incorrect_spec = spec
661-
reresolve_without([spec])
653+
reresolve_without([e.spec])
662654
retry
663655
end
664656

0 commit comments

Comments
 (0)