Merge pull request #7745 from hashicorp/investigate_crash

small cleanups

packer/ui.go

@@ -356,6 +356,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

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() {