Merge pull request #1111 from njhartwell/master

builder/amazon/chroot: Appending wildcard to src causes problems
This commit is contained in:
Mitchell Hashimoto 2014-05-02 09:47:46 -07:00
commit 97115821ac

View file

@ -82,7 +82,7 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error
// TODO: remove any file copied if it appears in `exclude`
chrootDest := filepath.Join(c.Chroot, dst)
log.Printf("Uploading directory '%s' to '%s'", src, chrootDest)
cpCmd, err := c.CmdWrapper(fmt.Sprintf("cp -R %s* %s", src, chrootDest))
cpCmd, err := c.CmdWrapper(fmt.Sprintf("cp -R '%s' %s", src, chrootDest))
if err != nil {
return err
}