builder/common: multistep debug fn gracefully exits during an interrupt

builder/common/multistep_debug.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
+	"time"
 )
 
 // MultistepDebugFn will return a proper multistep.DebugPauseFn to
@@ -21,10 +22,23 @@ func MultistepDebugFn(ui packer.Ui) multistep.DebugPauseFn {
 		}
 
 		message := fmt.Sprintf(
-			"Pausing %s step '%s'. Press any key to continue.\n",
+			"Pausing %s step '%s'. Press any key to continue.",
 			locationString, name)
 
-		ui.Say(message)
-		ui.Ask("")
+		result := make(chan string, 1)
+		go func() {
+			result <- ui.Ask(message)
+		}()
+
+		for {
+			select {
+			case <-result:
+				return
+			case <-time.After(100 * time.Millisecond):
+				if _, ok := state[multistep.StateCancelled]; ok {
+					return
+				}
+			}
+		}
 	}
 }

builder/vmware/builder.go

@@ -219,7 +219,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 	// Run!
 	if b.config.PackerDebug {
 		b.runner = &multistep.DebugRunner{
-			Steps: steps,
+			Steps:   steps,
 			PauseFn: common.MultistepDebugFn(ui),
 		}
 	} else {

packer/rpc/ui_test.go

@@ -7,8 +7,8 @@ import (
 )
 
 type testUi struct {
-	askCalled bool
-	askQuery string
+	askCalled      bool
+	askQuery       string
 	errorCalled    bool
 	errorMessage   string
 	messageCalled  bool

packer/ui.go

@@ -110,7 +110,7 @@ func (rw *ReaderWriterUi) Ask(query string) string {
 
 	var line string
 	if _, err := fmt.Fscanln(rw.Reader, &line); err != nil {
-		panic(err)
+		log.Printf("ui: scan err: %s", err)
 	}
 
 	return line