Commit e44aea49 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/qemu: passing tests

parent 2e438b7e
...@@ -92,15 +92,15 @@ type config struct { ...@@ -92,15 +92,15 @@ type config struct {
tpl *packer.ConfigTemplate tpl *packer.ConfigTemplate
} }
func (b *Builder) Prepare(raws ...interface{}) error { func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
md, err := common.DecodeConfig(&b.config, raws...) md, err := common.DecodeConfig(&b.config, raws...)
if err != nil { if err != nil {
return err return nil, err
} }
b.config.tpl, err = packer.NewConfigTemplate() b.config.tpl, err = packer.NewConfigTemplate()
if err != nil { if err != nil {
return err return nil, err
} }
b.config.tpl.UserVars = b.config.PackerUserVars b.config.tpl.UserVars = b.config.PackerUserVars
...@@ -361,10 +361,10 @@ func (b *Builder) Prepare(raws ...interface{}) error { ...@@ -361,10 +361,10 @@ func (b *Builder) Prepare(raws ...interface{}) error {
} }
if errs != nil && len(errs.Errors) > 0 { if errs != nil && len(errs.Errors) > 0 {
return errs return nil, errs
} }
return nil return nil, nil
} }
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) { func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
......
This diff is collapsed.
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