diff options
| author | Ken Barber <ken@bob.sh> | 2012-02-07 13:44:58 +0000 |
|---|---|---|
| committer | Ken Barber <ken@bob.sh> | 2012-02-07 13:44:58 +0000 |
| commit | d6fdfaba11aeff35604f1d5a917823f145a1cb76 (patch) | |
| tree | 1561491f9e3d9a67fa73399338ddf9bd675ae3f7 /lib/facter | |
| parent | 01b61a048367dc8fcf616985cc3076624f980058 (diff) | |
| parent | 46401caef6e00708867d09319985528c39636ba2 (diff) | |
Merge branch '2.2.x'
* 2.2.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 1e7cc62..b94aacd 100644 --- a/lib/facter/facter_dot_d.rb +++ b/lib/facter/facter_dot_d.rb @@ -55,8 +55,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| |