[CHEF-3506] suppress final node save when using override run list

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/chef/policy_builder/expand_node_object.rb b/lib/chef/policy_builder/expand_node_object.rb
index dbb11380c8..38b8b7551b 100644
--- a/lib/chef/policy_builder/expand_node_object.rb
+++ b/lib/chef/policy_builder/expand_node_object.rb
@@ -186,6 +186,13 @@ class Chef
         cookbook_hash
       end
 
+      # Indicates whether the policy is temporary, which means an
+      # override_runlist was provided. Chef::Client uses this to decide whether
+      # to do the final node save at the end of the run or not.
+      def temporary_policy?
+        !!@original_runlist
+      end
+
       ########################################
       # Internal public API
       ########################################
diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb
index e9041d5c0f..19b9aaf542 100644
--- a/lib/chef/policy_builder/policyfile.rb
+++ b/lib/chef/policy_builder/policyfile.rb
@@ -186,6 +186,12 @@ class Chef
         cookbooks_to_sync
       end
 
+      # Whether or not this is a temporary policy. Since PolicyBuilder doesn't
+      # support override_runlist, this is always false.
+      def temporary_policy?
+        false
+      end
+
       ## Internal Public API ##
 
       def run_list_with_versions_for_display