iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Return error if ssh-config command fails
This commit is contained in:
Megan Marsh 2020-11-04 10:39:23 -08:00 committed by GitHub
parent d8fec2e9e5 8248f52ff7
commit 23552bfbd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/vagrant/driver_2_2.go
View File

@ -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")