Revert "notes/reorg."

This reverts commit 73c5aec24d.

Conflicts:
	builder/amazon/chroot/step_copy_files.go
This commit is contained in:
Matthew Hooker 2013-09-26 01:16:51 -07:00
parent ce3725efec
commit 5e9ff92ff3
1 changed files with 16 additions and 16 deletions

View File

@ -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)