return provisioner Apply errors

EvaApplyProvisioners was not returning errors if there was already a
multierror stored in the Error field. Always return the error to the
caller.
This commit is contained in:
James Bardin 2018-03-15 14:29:15 -04:00
parent a1061ed931
commit b2d111c2bd
1 changed files with 2 additions and 5 deletions

View File

@ -227,11 +227,8 @@ func (n *EvalApplyProvisioners) Eval(ctx EvalContext) (interface{}, error) {
state.Tainted = true
}
if n.Error != nil {
*n.Error = multierror.Append(*n.Error, err)
} else {
return nil, err
}
*n.Error = multierror.Append(*n.Error, err)
return nil, err
}
{