Merge pull request #9197 from hashicorp/fix_9186
fix iso config prepare
This commit is contained in:
commit
0f3e749f1a
|
@ -63,11 +63,9 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
|
|||
warnings := make([]string, 0)
|
||||
errs := new(packer.MultiError)
|
||||
|
||||
if c.ISOUrls != nil {
|
||||
isoWarnings, isoErrs := c.ISOConfig.Prepare(&c.ctx)
|
||||
warnings = append(warnings, isoWarnings...)
|
||||
errs = packer.MultiErrorAppend(errs, isoErrs...)
|
||||
}
|
||||
isoWarnings, isoErrs := c.ISOConfig.Prepare(&c.ctx)
|
||||
warnings = append(warnings, isoWarnings...)
|
||||
errs = packer.MultiErrorAppend(errs, isoErrs...)
|
||||
|
||||
errs = packer.MultiErrorAppend(errs, c.ConnectConfig.Prepare()...)
|
||||
errs = packer.MultiErrorAppend(errs, c.CreateConfig.Prepare()...)
|
||||
|
|
|
@ -47,6 +47,7 @@ func TestFixerDockerTags_Fix(t *testing.T) {
|
|||
|
||||
output, err := f.Fix(input)
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equalf(t, expected, output, "should have removed tag from template")
|
||||
for k, v := range expected {
|
||||
assert.EqualValues(t, v, output[k])
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue