diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-09 10:05:47 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-09 10:05:47 -0700 |
| commit | b7a5d28ac34d4661bb8a4e2e92d25e023f60f987 (patch) | |
| tree | 99fede241b3b91687a15e55a9d045885562c8056 /lib/chef/chef_fs/file_system | |
| parent | adbb0fa85cc45b93ba91dc3019094b312cafb35c (diff) | |
| download | chef-b7a5d28ac34d4661bb8a4e2e92d25e023f60f987.tar.gz | |
Revert "remove #to_json Monkeytpatching"
This reverts commit adbb0fa85cc45b93ba91dc3019094b312cafb35c.
Diffstat (limited to 'lib/chef/chef_fs/file_system')
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb | 1 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/rest_list_entry.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb index 1b99a0a9cd..3d3f58201e 100644 --- a/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb @@ -41,7 +41,6 @@ class Chef def chef_object begin - # FIXME: FFI_Yajl needs to support :create_additions and this needs to use it return data_handler.chef_object(JSON.parse(read, :create_additions => false)) rescue Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}") diff --git a/lib/chef/chef_fs/file_system/rest_list_entry.rb b/lib/chef/chef_fs/file_system/rest_list_entry.rb index ce1b27df6a..0d5557de1d 100644 --- a/lib/chef/chef_fs/file_system/rest_list_entry.rb +++ b/lib/chef/chef_fs/file_system/rest_list_entry.rb @@ -128,7 +128,6 @@ class Chef value = minimize_value(value) value_json = Chef::JSONCompat.to_json_pretty(value) begin - # FIXME: replace with FFI_Yajl when it supports :create_additions other_value = JSON.parse(other_value_json, :create_additions => false) rescue JSON::ParserError => e Chef::Log.warn("Parse error reading #{other.path_for_printing} as JSON: #{e}") @@ -146,7 +145,6 @@ class Chef def write(file_contents) begin - # FIXME: replace with FFI_Yajl when it supports :create_additions object = JSON.parse(file_contents, :create_additions => false) rescue JSON::ParserError => e raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e), "Parse error reading JSON: #{e}" |