iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comment, formatting.

This commit is contained in:
Matthew Hooker 2013-09-29 08:04:57 +00:00
parent a15f629f4f
commit 5f19648268
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/amazon/chroot/builder.go
View File

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

1
builder/amazon/chroot/communicator.go
View File

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