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

Fix Ansible provisioner exit code reporting 

In eb70c0d6bb we were trying to compare a Subprocess::Result to a
Fixnum, resulting in Vagrant always reporting failure regardless of
Ansible's exit code.
This commit is contained in:
Ches Martin 2013-07-30 19:25:15 +07:00
parent a2925f0ff5
commit d937cca495
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/provisioners/ansible/provisioner.rb
View File

@ -31,13 +31,13 @@ module VagrantPlugins
} }
begin begin
exit_status = Vagrant::Util::Subprocess.execute(*command) do |type, data| result = Vagrant::Util::Subprocess.execute(*command) do |type, data|
if type == :stdout || type == :stderr if type == :stdout || type == :stderr
@machine.env.ui.info(data, :new_line => false, :prefix => false) @machine.env.ui.info(data, :new_line => false, :prefix => false)
end end
end end
raise Vagrant::Errors::AnsibleFailed if exit_status != 0 raise Vagrant::Errors::AnsibleFailed if result.exit_code != 0
rescue Vagrant::Util::Subprocess::LaunchError rescue Vagrant::Util::Subprocess::LaunchError
raise Vagrant::Errors::AnsiblePlaybookAppNotFound raise Vagrant::Errors::AnsiblePlaybookAppNotFound
end end