summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-05 13:16:50 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-02-21 14:32:17 -0800
commit221b7ca1ce37dbf10107c42ff221411311c90ee8 (patch)
tree39a2e8d984a227fa96bd83b2fcbe0392446e78ec
parente7f018ade52125a8c5775fb713002104167db355 (diff)
downloadchef-221b7ca1ce37dbf10107c42ff221411311c90ee8.tar.gz
reset wasn't setting generated_cache = true
make generate_cache responsible for that Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/node/immutable_collections.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/node/immutable_collections.rb b/lib/chef/node/immutable_collections.rb
index 55f24f0c95..fd1227f05f 100644
--- a/lib/chef/node/immutable_collections.rb
+++ b/lib/chef/node/immutable_collections.rb
@@ -132,13 +132,11 @@ class Chef
def reset
@short_circuit_attr_level = nil
generate_cache
- @generated_cache = true
end
# @api private
def ensure_generated_cache!
generate_cache unless @generated_cache
- @generated_cache = true
end
# This can be set to e.g. [ :@default ] by the parent container to cause this container
@@ -197,6 +195,7 @@ class Chef
value.short_circuit_attr_levels = @tracked_components if value.respond_to?(:short_circuit_attr_levels)
end
end
+ @generated_cache = true
end
# needed for __path__
@@ -317,7 +316,6 @@ class Chef
# @api private
def ensure_generated_cache!
generate_cache unless @generated_cache
- @generated_cache = true
end
# @api private
@@ -350,6 +348,7 @@ class Chef
value.short_circuit_attr_levels = tracked_components if value.respond_to?(:short_circuit_attr_levels)
end
end
+ @generated_cache = true
end
prepend Chef::Node::Mixin::StateTracking