diff options
| author | Ken Barber <ken@bob.sh> | 2012-02-07 13:37:16 +0000 |
|---|---|---|
| committer | Ken Barber <ken@bob.sh> | 2012-02-07 13:37:16 +0000 |
| commit | 46401caef6e00708867d09319985528c39636ba2 (patch) | |
| tree | be062a15a4b2e88b6a4108555389f7a69cd2f14a /lib/facter | |
| parent | a03d8cda18ab7cc8e05bdbbb4758afe51779dc86 (diff) | |
| parent | 52bc8809cbdedbacf219289df1f9f48056e6b935 (diff) | |
Merge branch '2.1.x' into 2.2.x
* 2.1.x:
(#12377) Avoid infinite loop when retrying require json
Diffstat (limited to 'lib/facter')
| -rw-r--r-- | lib/facter/facter_dot_d.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/facter/facter_dot_d.rb b/lib/facter/facter_dot_d.rb index 90586a9..2658dfe 100644 --- a/lib/facter/facter_dot_d.rb +++ b/lib/facter/facter_dot_d.rb @@ -54,8 +54,8 @@ class Facter::Util::DotD begin require 'json' rescue LoadError - require 'rubygems' - retry + retry if require 'rubygems' + raise end JSON.load(File.read(file)).each_pair do |f, v| |