diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-08-12 13:40:48 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-08-12 13:40:48 -0700 |
| commit | a5583fce14173021f6c9e3e145d59ec584c371f8 (patch) | |
| tree | 87df8b15504f1d3bb7ba3fca7c6eec19ce19a7ab /lib/chef/cookbook/cookbook_version_loader.rb | |
| parent | 1ad7c5938a3eb83200616142d0a0b857d416a300 (diff) | |
| parent | f398a43e00cd08033977ab8437416359cd5a7ea5 (diff) | |
| download | chef-a5583fce14173021f6c9e3e145d59ec584c371f8.tar.gz | |
Merge pull request #1806 from opscode/lcg/removing-json-class1
remove some uses of from_json
Diffstat (limited to 'lib/chef/cookbook/cookbook_version_loader.rb')
| -rw-r--r-- | lib/chef/cookbook/cookbook_version_loader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/cookbook/cookbook_version_loader.rb b/lib/chef/cookbook/cookbook_version_loader.rb index ddbcb785dc..47258c4d4e 100644 --- a/lib/chef/cookbook/cookbook_version_loader.rb +++ b/lib/chef/cookbook/cookbook_version_loader.rb @@ -261,7 +261,7 @@ class Chef def apply_json_cookbook_version_metadata(file) begin - data = Chef::JSONCompat.from_json(IO.read(file), :create_additions => false) + data = Chef::JSONCompat.parse(IO.read(file)) @metadata.from_hash(data['metadata']) # the JSON cookbok metadata file is only used by chef-zero. # The Chef Server API currently does not enforce that the metadata @@ -281,7 +281,7 @@ class Chef def set_frozen if uploaded_cookbook_version_file begin - data = Chef::JSONCompat.from_json(IO.read(uploaded_cookbook_version_file), :create_additions => false) + data = Chef::JSONCompat.parse(IO.read(uploaded_cookbook_version_file)) @frozen = data['frozen?'] rescue Chef::Exceptions::JSON::ParseError Chef::Log.error("Couldn't parse cookbook metadata JSON for #@inferred_cookbook_name in #{uploaded_cookbook_version_file}") |