iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7745 from hashicorp/investigate_crash 

small cleanups
This commit is contained in:
Adrien Delorme 2019-06-14 10:09:32 +02:00 committed by GitHub
parent 1c3b234b55 88e5a21170
commit c9a22b6380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packer/ui.go
View File

@ -356,6 +356,7 @@ func (u *MachineReadableUi) Machine(category string, args ...string) {
panic(err) panic(err)
} }
} }
log.Printf("%d,%s,%s,%s\n", now.Unix(), target, category, argsString)
} }
// TimestampedUi is a UI that wraps another UI implementation and // TimestampedUi is a UI that wraps another UI implementation and

5
provisioner/shell-local/provisioner.go
View File

@ -27,11 +27,8 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, _ packer.Communicator) error { func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, _ packer.Communicator) error {
_, retErr := sl.Run(ctx, ui, &p.config) _, retErr := sl.Run(ctx, ui, &p.config)
if retErr != nil {
return retErr
}
return nil return retErr
} }
func (p *Provisioner) Cancel() { func (p *Provisioner) Cancel() {