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-05 13:17:50 -0800
commitf6f0569d5388acac8aaf5d1a56961fa4c24d1521 (patch)
tree89064c5c91f4eb6abc1f48b6cd2c50480d33c6ac
parent097a8e3b41f55b9e0aba46b7d7de36dcdd858710 (diff)
downloadchef-f6f0569d5388acac8aaf5d1a56961fa4c24d1521.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 187da2dbf9..441738ccc2 100644
--- a/lib/chef/node/immutable_collections.rb
+++ b/lib/chef/node/immutable_collections.rb
@@ -134,13 +134,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
@@ -199,6 +197,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__
@@ -350,7 +349,6 @@ class Chef
# @api private
def ensure_generated_cache!
generate_cache unless @generated_cache
- @generated_cache = true
end
# @api private
@@ -383,6 +381,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