From 0659ccdea0c0632362b31cabe9a94060fa1c81db Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Thu, 26 Sep 2013 01:16:51 -0700 Subject: [PATCH] Revert "notes/reorg." This reverts commit 73c5aec24d0a504ecfbae038b4b7effb54adb929. Conflicts: builder/amazon/chroot/step_copy_files.go --- builder/amazon/chroot/communicator.go | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/builder/amazon/chroot/communicator.go b/builder/amazon/chroot/communicator.go index ba71d8605..741de2d83 100644 --- a/builder/amazon/chroot/communicator.go +++ b/builder/amazon/chroot/communicator.go @@ -53,6 +53,22 @@ func (c *Communicator) Start(cmd *packer.RemoteCmd) error { return nil } +func (c *Communicator) Upload(dst string, r io.Reader) error { + dst = filepath.Join(c.Chroot, dst) + log.Printf("Uploading to chroot dir: %s", dst) + f, err := os.Create(dst) + if err != nil { + return err + } + defer f.Close() + + if _, err := io.Copy(f, r); err != nil { + return err + } + + return nil +} + func (c *Communicator) UploadDir(dst string, src string, exclude []string) error { walkFn := func(fullPath string, info os.FileInfo, err error) error { if err != nil { @@ -81,22 +97,6 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error return filepath.Walk(src, walkFn) } -func (c *Communicator) Upload(dst string, r io.Reader) error { - dst = filepath.Join(c.Chroot, dst) - log.Printf("Uploading to chroot dir: %s", dst) - f, err := os.Create(dst) - if err != nil { - return err - } - defer f.Close() - - if _, err := io.Copy(f, r); err != nil { - return err - } - - return nil -} - func (c *Communicator) Download(src string, w io.Writer) error { src = filepath.Join(c.Chroot, src) log.Printf("Downloading from chroot dir: %s", src)