Merge pull request #7720 from MsysTechnologiesllc/dh/MSYS-889_chef_apply_crash_with_reboot

Fix chef-apply crash for reboot

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 7325d89e1e..5b697703d7 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -191,10 +191,12 @@ class Chef::Application::Apply < Chef::Application
     recipe, run_context = get_recipe_and_run_context
     recipe.instance_eval(@recipe_text, @recipe_filename, 1)
     runner = Chef::Runner.new(run_context)
-    begin
-      runner.converge
-    ensure
-      @recipe_fh.close
+    catch(:end_client_run_early) do
+      begin
+        runner.converge
+      ensure
+        @recipe_fh.close
+      end
     end
     Chef::Platform::Rebooter.reboot_if_needed!(runner)
   end