Commit 4576093c authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

fmt

parent 9a622691
...@@ -75,8 +75,8 @@ func NewDriver(dconfig *DriverConfig, config *SSHConfig) (Driver, error) { ...@@ -75,8 +75,8 @@ func NewDriver(dconfig *DriverConfig, config *SSHConfig) (Driver, error) {
} }
case "linux": case "linux":
drivers = []Driver{ drivers = []Driver{
&Workstation10Driver { &Workstation10Driver{
Workstation9Driver: Workstation9Driver { Workstation9Driver: Workstation9Driver{
SSHConfig: config, SSHConfig: config,
}, },
}, },
......
package common package common
import ( import (
"os/exec"
"bytes" "bytes"
"regexp"
"fmt" "fmt"
"log" "log"
"strings" "os/exec"
"regexp"
"runtime" "runtime"
"strings"
) )
// Workstation10Driver is a driver that can run VMware Workstation 10 // Workstation10Driver is a driver that can run VMware Workstation 10
...@@ -32,14 +32,13 @@ func (d *Workstation10Driver) Clone(dst, src string) error { ...@@ -32,14 +32,13 @@ func (d *Workstation10Driver) Clone(dst, src string) error {
func (d *Workstation10Driver) Verify() error { func (d *Workstation10Driver) Verify() error {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
return fmt.Errorf("can't used driver WS 10 not yet supported on: %s", runtime.GOOS) return fmt.Errorf("WS10 driver is only supported on Linux at the moment. Your OS: %s", runtime.GOOS)
} }
if err := d.Workstation9Driver.Verify(); err != nil { if err := d.Workstation9Driver.Verify(); err != nil {
return err return err
} }
//TODO(pmyjavec) there is a better way to find this, how? //TODO(pmyjavec) there is a better way to find this, how?
//the default will suffice for now. //the default will suffice for now.
vmxpath := "/usr/lib/vmware/bin/vmware-vmx" vmxpath := "/usr/lib/vmware/bin/vmware-vmx"
......
...@@ -233,7 +233,7 @@ func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator) err ...@@ -233,7 +233,7 @@ func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator) err
} }
if cmd.ExitStatus != 0 { if cmd.ExitStatus != 0 {
if cmd.ExitStatus == 127 { if cmd.ExitStatus == 127 {
return fmt.Errorf("%s could not be found. Verify that it is available on the\n" + return fmt.Errorf("%s could not be found. Verify that it is available on the\n"+
"PATH after connecting to the machine.", "PATH after connecting to the machine.",
p.config.Command) p.config.Command)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment