summaryrefslogtreecommitdiff
path: root/lib/chef/config_fetcher.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-01-13 00:59:34 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2014-06-23 16:41:05 -0700
commit6a9ed8cc9a4df568ee0df35964f87007bfc730df (patch)
tree798f48e43d2ddbf9975eb4e60ce972b8e39dc71d /lib/chef/config_fetcher.rb
parentd111e820f1f3dba3e759f6f06bbeac30f8aa1389 (diff)
downloadchef-6a9ed8cc9a4df568ee0df35964f87007bfc730df.tar.gz
replace yajl and json gem with ffi-yajl
Diffstat (limited to 'lib/chef/config_fetcher.rb')
-rw-r--r--lib/chef/config_fetcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/config_fetcher.rb b/lib/chef/config_fetcher.rb
index 26440c9c01..c1fd262656 100644
--- a/lib/chef/config_fetcher.rb
+++ b/lib/chef/config_fetcher.rb
@@ -18,7 +18,7 @@ class Chef
config_data = read_config
begin
Chef::JSONCompat.from_json(config_data)
- rescue JSON::ParserError => error
+ rescue FFI_Yajl::ParseError => error
Chef::Application.fatal!("Could not parse the provided JSON file (#{config_location}): " + error.message, 2)
end
end