From 1aa1399e85af3bda4e64cc6d1393575d8a9ac15e Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 22 Jun 2015 12:46:13 -0700 Subject: [PATCH] builder/parallels: fix compilation issuse --- builder/parallels/common/prlctl_post_config.go | 17 +++-------------- builder/parallels/iso/builder.go | 4 ++-- builder/parallels/pvm/builder.go | 2 +- builder/parallels/pvm/config.go | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/builder/parallels/common/prlctl_post_config.go b/builder/parallels/common/prlctl_post_config.go index 23c2d5520..2490bc996 100644 --- a/builder/parallels/common/prlctl_post_config.go +++ b/builder/parallels/common/prlctl_post_config.go @@ -1,28 +1,17 @@ package common import ( - "fmt" - "github.com/mitchellh/packer/packer" + "github.com/mitchellh/packer/template/interpolate" ) type PrlctlPostConfig struct { PrlctlPost [][]string `mapstructure:"prlctl_post"` } -func (c *PrlctlPostConfig) Prepare(t *packer.ConfigTemplate) []error { +func (c *PrlctlPostConfig) Prepare(ctx *interpolate.Context) []error { if c.PrlctlPost == nil { c.PrlctlPost = make([][]string, 0) } - errs := make([]error, 0) - for i, args := range c.PrlctlPost { - for j, arg := range args { - if err := t.Validate(arg); err != nil { - errs = append(errs, - fmt.Errorf("Error processing prlctl_post[%d][%d]: %s", i, j, err)) - } - } - } - - return errs + return nil } diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index 0c3bc0384..4a75b0b47 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -79,7 +79,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) { errs, b.config.OutputConfig.Prepare(&b.config.ctx, &b.config.PackerConfig)...) errs = packer.MultiErrorAppend(errs, b.config.RunConfig.Prepare(&b.config.ctx)...) errs = packer.MultiErrorAppend(errs, b.config.PrlctlConfig.Prepare(&b.config.ctx)...) - errs = packer.MultiErrorAppend(errs, b.config.PrlctlPostConfig.Prepare(&b.config.tpl)...) + errs = packer.MultiErrorAppend(errs, b.config.PrlctlPostConfig.Prepare(&b.config.ctx)...) errs = packer.MultiErrorAppend(errs, b.config.PrlctlVersionConfig.Prepare(&b.config.ctx)...) errs = packer.MultiErrorAppend(errs, b.config.ShutdownConfig.Prepare(&b.config.ctx)...) errs = packer.MultiErrorAppend(errs, b.config.SSHConfig.Prepare(&b.config.ctx)...) @@ -270,7 +270,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe }, ¶llelscommon.StepPrlctl{ Commands: b.config.PrlctlPost, - Tpl: b.config.tpl, + Ctx: b.config.ctx, }, } diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go index 87a92989a..471b59bef 100644 --- a/builder/parallels/pvm/builder.go +++ b/builder/parallels/pvm/builder.go @@ -103,7 +103,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe }, ¶llelscommon.StepPrlctl{ Commands: b.config.PrlctlPost, - Tpl: b.config.tpl, + Ctx: b.config.ctx, }, } diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index 767ed913c..f03584bf2 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -58,7 +58,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) { errs = packer.MultiErrorAppend(errs, c.FloppyConfig.Prepare(&c.ctx)...) errs = packer.MultiErrorAppend(errs, c.OutputConfig.Prepare(&c.ctx, &c.PackerConfig)...) errs = packer.MultiErrorAppend(errs, c.PrlctlConfig.Prepare(&c.ctx)...) - errs = packer.MultiErrorAppend(errs, c.PrlctlPostConfig.Prepare(&c.tpl)...) + errs = packer.MultiErrorAppend(errs, c.PrlctlPostConfig.Prepare(&c.ctx)...) errs = packer.MultiErrorAppend(errs, c.PrlctlVersionConfig.Prepare(&c.ctx)...) errs = packer.MultiErrorAppend(errs, c.RunConfig.Prepare(&c.ctx)...) errs = packer.MultiErrorAppend(errs, c.ShutdownConfig.Prepare(&c.ctx)...)