From 656de901ca0826ce76c70a4c33d0b657b48272f0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 12 Aug 2013 15:17:17 -0700
Subject: [PATCH] packer: replace stdout/stderr after StartWithUi

This just kind of shields the error with StartWithUi if we retry
---
 packer/communicator.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packer/communicator.go b/packer/communicator.go
index 577c6ab80..859495cd3 100644
--- a/packer/communicator.go
+++ b/packer/communicator.go
@@ -72,6 +72,14 @@ func (r *RemoteCmd) StartWithUi(c Communicator, ui Ui) error {
 	defer stdout_w.Close()
 	defer stderr_w.Close()
 
+	// Retain the original stdout/stderr that we can replace back in.
+	originalStdout := r.Stdout
+	originalStderr := r.Stderr
+	defer func() {
+		r.Stdout = originalStdout
+		r.Stderr = originalStderr
+	}()
+
 	// Set the writers for the output so that we get it streamed to us
 	if r.Stdout == nil {
 		r.Stdout = stdout_w