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

Merge pull request #4087 from zr40/fix/master/prevent-double-output 

Don't output stdout and stderr twice when shell provisioner fails
This commit is contained in:
Mitchell Hashimoto 2014-08-06 10:32:13 -07:00
parent c2a019dccc 1091b4cb54
commit e82d425719
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/provisioners/shell/provisioner.rb
View File

@ -65,7 +65,11 @@ module VagrantPlugins
end end
# Execute it with sudo # Execute it with sudo
comm.execute(command, sudo: config.privileged) do |type, data| comm.execute(
command,
sudo: config.privileged,
error_key: :ssh_bad_exit_status_muted
) do |type, data|
handle_comm(type, data) handle_comm(type, data)
end end
end end

3
templates/locales/en.yml
View File

@ -968,6 +968,9 @@ en:
Stderr from the command: Stderr from the command:
%{stderr} %{stderr}
ssh_bad_exit_status_muted: |-
The SSH command responded with a non-zero exit status.
Vagrant assumes that this means the command failed!
ssh_connect_eacces: |- ssh_connect_eacces: |-
SSH is getting permission denied errors when attempting to connect SSH is getting permission denied errors when attempting to connect
to the IP for SSH. This is usually caused by network rules and not being to the IP for SSH. This is usually caused by network rules and not being