Merge pull request #10213 from chrisroberts/vagrant-driv-stderr

Return error if ssh-config command fails
5 years ago · 23552bfbd7
parent d8fec2e9e5 8248f52ff7
commit 23552bfbd7
1 changed files with 4 additions and 2 deletions
--- a/builder/vagrant/driver_2_2.go
+++ b/builder/vagrant/driver_2_2.go
@ -154,8 +154,10 @@ func (d *Vagrant_2_2_Driver) SSHConfig(id string) (*VagrantSSHConfig, error) {
 	sshConf := &VagrantSSHConfig{}

 	stdout, stderr, err := d.vagrantCmd(args...)
-	if stderr != "" {
-		err := fmt.Errorf("ssh-config command returned error: %s", stderr)
+	if err != nil {
+		if stderr != "" {
+			err = fmt.Errorf("ssh-config command returned errors: %s", stderr)
+		}
 		return sshConf, err
 	}
 	lines := strings.Split(stdout, "\n")