From 8248f52ff740db7f907e4e8cdd23a9941e21d238 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Nov 2020 16:20:34 -0800 Subject: [PATCH] Return error if ssh-config command fails Update error detection to return an error if the process fails instead of testing for content in stderr. --- builder/vagrant/driver_2_2.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builder/vagrant/driver_2_2.go b/builder/vagrant/driver_2_2.go index c1df9ea98..cb2243ad5 100644 --- 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")