diff options
author | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2018-10-04 17:21:28 +0530 |
---|---|---|
committer | dheerajd-msys <dheeraj.dubey@msystechnologies.com> | 2018-10-04 17:21:28 +0530 |
commit | 462c52984d0e059c24d36038e801caa1a800bfb8 (patch) | |
tree | 3bacd30ddf0e3a2a9fa0655989fcead20c23980d | |
parent | 9a8182d5559395f0b1b36bafd62af6e5a626ad8c (diff) | |
download | chef-462c52984d0e059c24d36038e801caa1a800bfb8.tar.gz |
fix chef-apply crash for reboot
Signed-off-by: dheerajd-msys <dheeraj.dubey@msystechnologies.com>
-rw-r--r-- | lib/chef/application/apply.rb | 10 |
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 |