This commit is contained in:
Mark Peek 2015-10-18 11:13:09 -07:00
parent f6c7e3740f
commit c48548b3bb
3 changed files with 12 additions and 12 deletions

View File

@ -177,9 +177,9 @@ func vncSendString(c *vnc.ClientConn, original string) {
}
c.KeyEvent(keyCode, true)
time.Sleep(time.Second/10)
time.Sleep(time.Second / 10)
c.KeyEvent(keyCode, false)
time.Sleep(time.Second/10)
time.Sleep(time.Second / 10)
if keyShift {
c.KeyEvent(KeyLeftShift, false)

View File

@ -46,8 +46,8 @@ type Config struct {
ctx interpolate.Context
user, name string
buildId int
compileId int
buildId int
compileId int
}
type PostProcessor struct {
@ -159,13 +159,13 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
}
opts := &atlas.UploadArtifactOpts{
User: p.config.user,
Name: p.config.name,
Type: p.config.Type,
ID: artifact.Id(),
Metadata: p.metadata(artifact),
BuildID: p.config.buildId,
CompileID: p.config.compileId,
User: p.config.user,
Name: p.config.name,
Type: p.config.Type,
ID: artifact.Id(),
Metadata: p.metadata(artifact),
BuildID: p.config.buildId,
CompileID: p.config.compileId,
}
if fs := artifact.Files(); len(fs) > 0 {

View File

@ -194,7 +194,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
}
ui.Message("Running highstate")
cmd := &packer.RemoteCmd{Command: fmt.Sprintf(p.sudo("salt-call --local state.highstate --file-root=%s --pillar-root=%s -l info --retcode-passthrough"),p.config.RemoteStateTree, p.config.RemotePillarRoots)}
cmd := &packer.RemoteCmd{Command: fmt.Sprintf(p.sudo("salt-call --local state.highstate --file-root=%s --pillar-root=%s -l info --retcode-passthrough"), p.config.RemoteStateTree, p.config.RemotePillarRoots)}
if err = cmd.StartWithUi(comm, ui); err != nil || cmd.ExitStatus != 0 {
if err == nil {
err = fmt.Errorf("Bad exit status: %d", cmd.ExitStatus)