diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go index 2cf130fb9..f0f53a150 100644 --- a/builder/vmware/common/driver.go +++ b/builder/vmware/common/driver.go @@ -75,11 +75,11 @@ func NewDriver(dconfig *DriverConfig, config *SSHConfig) (Driver, error) { } case "linux": drivers = []Driver{ - &Workstation10Driver { - Workstation9Driver: Workstation9Driver { - SSHConfig: config, - }, - }, + &Workstation10Driver{ + Workstation9Driver: Workstation9Driver{ + SSHConfig: config, + }, + }, &Workstation9Driver{ SSHConfig: config, }, diff --git a/builder/vmware/common/driver_workstation10.go b/builder/vmware/common/driver_workstation10.go index 31bad72fa..be127356d 100644 --- a/builder/vmware/common/driver_workstation10.go +++ b/builder/vmware/common/driver_workstation10.go @@ -1,48 +1,47 @@ package common import ( - "os/exec" - "bytes" - "regexp" - "fmt" - "log" - "strings" - "runtime" + "bytes" + "fmt" + "log" + "os/exec" + "regexp" + "runtime" + "strings" ) // Workstation10Driver is a driver that can run VMware Workstation 10 // installations. Current only tested for UNIX type Workstation10Driver struct { - Workstation9Driver + Workstation9Driver } func (d *Workstation10Driver) Clone(dst, src string) error { - cmd := exec.Command(d.Workstation9Driver.VmrunPath, - "-T", "ws", - "clone", src, dst, - "full") + cmd := exec.Command(d.Workstation9Driver.VmrunPath, + "-T", "ws", + "clone", src, dst, + "full") - if _, _, err := runAndLog(cmd); err != nil { - return err - } + if _, _, err := runAndLog(cmd); err != nil { + return err + } - return nil + return nil } func (d *Workstation10Driver) Verify() error { - if runtime.GOOS != "linux" { - return fmt.Errorf("can't used driver WS 10 not yet supported on: %s", runtime.GOOS) - } + if runtime.GOOS != "linux" { + 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 { - return err - } + if err := d.Workstation9Driver.Verify(); err != nil { + return err + } - - //TODO(pmyjavec) there is a better way to find this, how? - //the default will suffice for now. - vmxpath := "/usr/lib/vmware/bin/vmware-vmx" + //TODO(pmyjavec) there is a better way to find this, how? + //the default will suffice for now. + vmxpath := "/usr/lib/vmware/bin/vmware-vmx" var stderr bytes.Buffer cmd := exec.Command(vmxpath, "-v") @@ -64,5 +63,5 @@ func (d *Workstation10Driver) Verify() error { "WS 10 not detected. Got version: %s", matches[1]) } - return nil + return nil } diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 8a255961a..f08c2985f 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -233,7 +233,7 @@ func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator) err } if cmd.ExitStatus != 0 { 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.", p.config.Command) }