From f3a4d44066ce6553eb7e50b25f214b91de351992 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 30 Jul 2013 15:55:45 -0700
Subject: [PATCH] builder/amazon/chroot: make sure to remove files before copy

---
 builder/amazon/chroot/step_copy_files.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/builder/amazon/chroot/step_copy_files.go b/builder/amazon/chroot/step_copy_files.go
index 05f523c13..e1a4878ab 100644
--- a/builder/amazon/chroot/step_copy_files.go
+++ b/builder/amazon/chroot/step_copy_files.go
@@ -42,11 +42,18 @@ func (s *StepCopyFiles) Run(state map[string]interface{}) multistep.StepAction {
 func (s *StepCopyFiles) Cleanup(state map[string]interface{}) {}
 
 func (s *StepCopyFiles) copySingle(dst, src string) error {
+	// Stat the src file so we can copy the mode later
 	srcInfo, err := os.Stat(src)
 	if err != nil {
 		return err
 	}
 
+	// Remove any existing destination file
+	if err := os.Remove(dst); err != nil {
+		return err
+	}
+
+	// Copy the files
 	srcF, err := os.Open(src)
 	if err != nil {
 		return err
@@ -57,11 +64,14 @@ func (s *StepCopyFiles) copySingle(dst, src string) error {
 	if err != nil {
 		return err
 	}
+	defer dstF.Close()
 
 	if _, err := io.Copy(dstF, srcF); err != nil {
 		return err
 	}
+	dstF.Close()
 
+	// Match the mode
 	if err := os.Chmod(dst, srcInfo.Mode()); err != nil {
 		return err
 	}