Skip to content

Commit 52bc880

Browse files
committed
Merge branch 'ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful' into 2.1.x
* ticket/2.2.x/12377_stdlib_facter_dot_d_loaderror_recovery_may_be_harmful: (#12377) Avoid infinite loop when retrying require json
2 parents 4c2bba8 + 24f7095 commit 52bc880

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/facter/facter_dot_d.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def json_parser(file)
5454
begin
5555
require 'json'
5656
rescue LoadError
57-
require 'rubygems'
58-
retry
57+
retry if require 'rubygems'
58+
raise
5959
end
6060

6161
JSON.load(File.read(file)).each_pair do |f, v|

0 commit comments

Comments
 (0)