From e30c55a9b66ffaf731cfcc2728b13d11feb961f5 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Thu, 20 Nov 2014 12:39:20 +0300 Subject: drop expensive exception handling Signed-off-by: Vasiliy Tolstov --- lib/chef/application/client.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/chef') diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 51d753d32f..753a9c2804 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -282,14 +282,8 @@ class Chef::Application::Client < Chef::Application FileUtils.mkdir_p(Chef::Config.chef_repo_path) tarball_path = File.join(Chef::Config.chef_repo_path, 'recipes.tgz') fetch_recipe_tarball(Chef::Config[:recipe_url], tarball_path) - begin - result = shell_out("tar zxvf #{tarball_path} -C #{Chef::Config.chef_repo_path}") - Chef::Log.debug "#{result.stdout}" - Chef::Log.debug "#{result.stderr}" - result.error! if result.error? - rescue Mixlib::ShellOut::ShellCommandFailed => e - Chef::Log.error "Not able to unpack recipes archive (#{e})" - end + result = shell_out!("tar zxvf #{tarball_path} -C #{Chef::Config.chef_repo_path}") + Chef::Log.debug "#{result.stdout}" end Chef::Config.chef_zero.host = config[:chef_zero_host] if config[:chef_zero_host] -- cgit v1.2.1