This commit is contained in:
Mitchell Hashimoto 2013-06-11 14:09:31 -07:00
parent de9c4ace9e
commit 417f7e7f47
4 changed files with 5 additions and 5 deletions

View File

@ -74,7 +74,7 @@ func (s *stepConnectSSH) Run(state map[string]interface{}) multistep.StepAction
log.Printf("Waiting up to %s for SSH connection", config.SSHTimeout)
timeout := time.After(config.SSHTimeout)
ConnectWaitLoop:
ConnectWaitLoop:
for {
select {
case <-connected:

View File

@ -5,8 +5,8 @@ package shell
import (
"bufio"
"bytes"
"fmt"
"errors"
"fmt"
"github.com/mitchellh/iochan"
"github.com/mitchellh/mapstructure"
"github.com/mitchellh/packer/packer"
@ -104,7 +104,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) {
// Write our contents to it
writer := bufio.NewWriter(tf)
for _, command := range p.config.Inline {
if _, err := writer.WriteString(command+"\n"); err != nil {
if _, err := writer.WriteString(command + "\n"); err != nil {
ui.Error(fmt.Sprintf("Error preparing shell script: %s", err))
return
}