haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No longer need subprocess wrapping there :)

This commit is contained in:
Seth Vargo 2015-07-09 16:04:15 -06:00
parent 68ef9676c7
commit 742d47c4cf
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/provisioners/chef/provisioner/chef_client.rb
View File

@ -114,16 +114,14 @@ module VagrantPlugins
# Knife is not part of the current Vagrant bundle, so it needs to run # Knife is not part of the current Vagrant bundle, so it needs to run
# in the context of the system. # in the context of the system.
Vagrant.global_lock do Vagrant.global_lock do
Vagrant::Util::Env.with_clean_env do command = ["knife", deletable, "delete", "--yes", node_name]
command = ["knife", deletable, "delete", "--yes", node_name] r = Vagrant::Util::Subprocess.execute(*command)
r = Vagrant::Util::Subprocess.execute(*command) if r.exit_code != 0
if r.exit_code != 0 @machine.ui.error(I18n.t(
@machine.ui.error(I18n.t( "vagrant.chef_client_cleanup_failed",
"vagrant.chef_client_cleanup_failed", deletable: deletable,
deletable: deletable, stdout: r.stdout,
stdout: r.stdout, stderr: r.stderr))
stderr: r.stderr))
end
end end
end end
end end