From a2126740a5491891274259e7e8da2ff9a443abd2 Mon Sep 17 00:00:00 2001 From: somerandomqaguy <76200225+somerandomqaguy@users.noreply.github.com> Date: Tue, 27 Sep 2022 23:05:02 -0600 Subject: [PATCH] Capture actual errors from Prepare Solves TestBuilderPrepare_InvalidKey failing, since we weren't capturing it's errors before. --- builder/xenserver/iso/builder.go | 2 +- builder/xenserver/xva/builder.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/xenserver/iso/builder.go b/builder/xenserver/iso/builder.go index a9e37f1..d39a2bf 100644 --- a/builder/xenserver/iso/builder.go +++ b/builder/xenserver/iso/builder.go @@ -40,7 +40,7 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, warns []stri }, raws...) if err != nil { - packer.MultiErrorAppend(errs, err) + errs = packer.MultiErrorAppend(errs, err) } errs = packer.MultiErrorAppend( diff --git a/builder/xenserver/xva/builder.go b/builder/xenserver/xva/builder.go index 00235d2..4eee1c4 100644 --- a/builder/xenserver/xva/builder.go +++ b/builder/xenserver/xva/builder.go @@ -38,7 +38,7 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, warns []stri }, raws...) if err != nil { - packer.MultiErrorAppend(errs, err) + errs = packer.MultiErrorAppend(errs, err) } errs = packer.MultiErrorAppend(