From 91aa5f8bbbdbe0ac75ffa012e572d9ca19ee4416 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Thu, 7 Jun 2018 15:35:36 -0700
Subject: [PATCH] resolve conflicts; fix to work with hookedprovisioner which
 has been added since PR was made

---
 packer/build.go       | 16 ++++++++++++----
 packer/core.go        |  1 -
 packer/provisioner.go |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packer/build.go b/packer/build.go
index 1187e49d7..bb441b522 100644
--- a/packer/build.go
+++ b/packer/build.go
@@ -200,10 +200,18 @@ func (b *coreBuild) Run(originalUi Ui, cache Cache) ([]Artifact, error) {
 			if len(p.config) > 0 {
 				pConfig = p.config[0]
 			}
-			hookedProvisioners[i] = &HookedProvisioner{
-				p.provisioner,
-				pConfig,
-				p.pType,
+			if b.debug {
+				hookedProvisioners[i] = &HookedProvisioner{
+					&DebuggedProvisioner{Provisioner: p.provisioner},
+					pConfig,
+					p.pType,
+				}
+			} else {
+				hookedProvisioners[i] = &HookedProvisioner{
+					p.provisioner,
+					pConfig,
+					p.pType,
+				}
 			}
 		}
 
diff --git a/packer/core.go b/packer/core.go
index e6d82aaed..c8ac2cfb7 100644
--- a/packer/core.go
+++ b/packer/core.go
@@ -152,7 +152,6 @@ func (c *Core) Build(n string) (Build, error) {
 				Provisioner: provisioner,
 			}
 		}
-		if config.PackerDebug
 
 		provisioners = append(provisioners, coreBuildProvisioner{
 			pType:       rawP.Type,
diff --git a/packer/provisioner.go b/packer/provisioner.go
index c9af06f54..a565c30e2 100644
--- a/packer/provisioner.go
+++ b/packer/provisioner.go
@@ -170,8 +170,8 @@ func (p *PausedProvisioner) provision(result chan<- error, ui Ui, comm Communica
 	result <- p.Provisioner.Provision(ui, comm)
 }
 
-// DebuggedProvisioner is a Provisioner implementation that wait key press before
-// the provisioner is actually run.
+// DebuggedProvisioner is a Provisioner implementation that waits until a key
+// press before the provisioner is actually run.
 type DebuggedProvisioner struct {
 	Provisioner Provisioner