summaryrefslogtreecommitdiff
path: root/lib/chef/application
diff options
context:
space:
mode:
authorVasiliy Tolstov <v.tolstov@selfip.ru>2014-11-20 12:39:20 +0300
committerLamont Granquist <lamont@scriptkiddie.org>2015-01-25 13:33:05 -0800
commite30c55a9b66ffaf731cfcc2728b13d11feb961f5 (patch)
tree96a077f66becf3b275745ba9cae099254dd61989 /lib/chef/application
parent3efa7da42222ccd5dbfd7c2391a6f09058a1ddcd (diff)
downloadchef-e30c55a9b66ffaf731cfcc2728b13d11feb961f5.tar.gz
drop expensive exception handling
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
Diffstat (limited to 'lib/chef/application')
-rw-r--r--lib/chef/application/client.rb10
1 files changed, 2 insertions, 8 deletions
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]