diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-11-16 10:36:29 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-11-16 10:38:50 -0800 |
| commit | e7057a5cd4c49b8325571d3ea7eb824f17fcb68c (patch) | |
| tree | 69154b257453723f635c34397679ac39a17802cb /lib/chef/resource_builder.rb | |
| parent | f0f89d3e3330bfa084d5d6b6d1b95fc72120e582 (diff) | |
| download | chef-e7057a5cd4c49b8325571d3ea7eb824f17fcb68c.tar.gz | |
simplify resource_cloning toggle PRlcg/resource-cloning-toggle
also add scarier banner to chef-config setting
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/resource_builder.rb')
| -rw-r--r-- | lib/chef/resource_builder.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource_builder.rb b/lib/chef/resource_builder.rb index 607e78358a..1aee852f5d 100644 --- a/lib/chef/resource_builder.rb +++ b/lib/chef/resource_builder.rb @@ -56,7 +56,7 @@ class Chef # This behavior is very counter-intuitive and should be removed. # See CHEF-3694, https://tickets.opscode.com/browse/CHEF-3694 # Moved to this location to resolve CHEF-5052, https://tickets.opscode.com/browse/CHEF-5052 - if prior_resource && run_context.resource_cloning + if prior_resource && Chef::Config[:resource_cloning] resource.load_from(prior_resource) end @@ -80,7 +80,7 @@ class Chef end # emit a cloned resource warning if it is warranted - if prior_resource && run_context.resource_cloning + if prior_resource && Chef::Config[:resource_cloning] if is_trivial_resource?(prior_resource) && identicalish_resources?(prior_resource, resource) emit_harmless_cloning_debug else |