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) log.Printf("Waiting up to %s for SSH connection", config.SSHTimeout)
timeout := time.After(config.SSHTimeout) timeout := time.After(config.SSHTimeout)
ConnectWaitLoop: ConnectWaitLoop:
for { for {
select { select {
case <-connected: case <-connected:

View File

@ -24,7 +24,7 @@ var managedClients = make([]*Client, 0, 5)
// RPC address, and returning various types of packer interface implementations // RPC address, and returning various types of packer interface implementations
// across the multi-process communication layer. // across the multi-process communication layer.
type Client struct { type Client struct {
config *ClientConfig config *ClientConfig
exited bool exited bool
doneLogging bool doneLogging bool
l sync.Mutex l sync.Mutex

View File

@ -35,7 +35,7 @@ func TestClient(t *testing.T) {
func TestClient_Start_Timeout(t *testing.T) { func TestClient_Start_Timeout(t *testing.T) {
config := &ClientConfig{ config := &ClientConfig{
Cmd: helperProcess("start-timeout"), Cmd: helperProcess("start-timeout"),
StartTimeout: 50 * time.Millisecond, StartTimeout: 50 * time.Millisecond,
} }

View File

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