Commit 5f196482 authored by Matthew Hooker's avatar Matthew Hooker

comment, formatting.

parent a15f629f
...@@ -166,9 +166,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe ...@@ -166,9 +166,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
ec2conn := ec2.New(auth, region) ec2conn := ec2.New(auth, region)
wrappedCommand := func(command string) *exec.Cmd { wrappedCommand := func(command string) *exec.Cmd {
wrapped, err := b.config.tpl.Process(b.config.CommandWrapper, &wrappedCommandTemplate{ wrapped, err := b.config.tpl.Process(
Command: command, b.config.CommandWrapper, &wrappedCommandTemplate{
}) Command: command,
})
if err != nil { if err != nil {
ui.Error(err.Error()) ui.Error(err.Error())
} }
......
...@@ -96,6 +96,7 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error ...@@ -96,6 +96,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) chrootDest := filepath.Join(c.Chroot, dst)
log.Printf("Uploading directory '%s' to '%s'", src, chrootDest) log.Printf("Uploading directory '%s' to '%s'", src, chrootDest)
cpCmd := fmt.Sprintf("cp -R %s* %s", src, chrootDest) cpCmd := fmt.Sprintf("cp -R %s* %s", src, chrootDest)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment