summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-06-13 11:29:00 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-06-23 16:41:06 -0700
commit8a5ba1e83e5517237d36abcf5b1b764653bd378b (patch)
treecbbaa4653484c1085a24e1b1d4f3dff6e20e22a2 /lib
parentf87886664d2c650d4dd6f656a1dd90dffb5d444d (diff)
downloadchef-8a5ba1e83e5517237d36abcf5b1b764653bd378b.tar.gz
we can still emit JSON::ParserErrors in compat mode
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/provider/remote_file/cache_control_data.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/remote_file/cache_control_data.rb b/lib/chef/provider/remote_file/cache_control_data.rb
index 545f2b571e..0add74f50a 100644
--- a/lib/chef/provider/remote_file/cache_control_data.rb
+++ b/lib/chef/provider/remote_file/cache_control_data.rb
@@ -140,7 +140,7 @@ class Chef
def load_data
Chef::JSONCompat.from_json(load_json_data)
- rescue Chef::Exceptions::FileNotFound, FFI_Yajl::ParseError
+ rescue Chef::Exceptions::FileNotFound, FFI_Yajl::ParseError, JSON::ParserError
false
end