From 6982ec796f0fb22554c06ab0eabbe792fa9d467d Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 12 Jun 2019 13:18:57 -0700 Subject: [PATCH 1/2] remove redundant error check --- provisioner/shell-local/provisioner.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/provisioner/shell-local/provisioner.go b/provisioner/shell-local/provisioner.go index 861e98427..9768f85b8 100644 --- a/provisioner/shell-local/provisioner.go +++ b/provisioner/shell-local/provisioner.go @@ -27,11 +27,8 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, _ packer.Communicator) error { _, retErr := sl.Run(ctx, ui, &p.config) - if retErr != nil { - return retErr - } - return nil + return retErr } func (p *Provisioner) Cancel() { From 88e5a21170d0aae3454291e34c24d941b1af561c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 13 Jun 2019 10:48:13 -0700 Subject: [PATCH 2/2] make sure machine readable logs print what's come through the UI into the logs --- packer/ui.go | 1 + 1 file changed, 1 insertion(+) diff --git a/packer/ui.go b/packer/ui.go index 9ba44518b..cc4dd0a7e 100644 --- a/packer/ui.go +++ b/packer/ui.go @@ -350,6 +350,7 @@ func (u *MachineReadableUi) Machine(category string, args ...string) { panic(err) } } + log.Printf("%d,%s,%s,%s\n", now.Unix(), target, category, argsString) } // TimestampedUi is a UI that wraps another UI implementation and