fixup rebase

This commit is contained in:
Danielle Lancashire 2019-08-12 15:41:14 +02:00
parent b38c1d810e
commit dec1a58b47
No known key found for this signature in database
GPG key ID: 8D65584EF3DDF91B

View file

@ -178,8 +178,7 @@ func parseTask(item *ast.ObjectItem) (*api.Task, error) {
// Parse volume mounts
if o := listVal.Filter("volume_mount"); len(o.Items) > 0 {
if err := parseVolumeMounts(&t.VolumeMounts, o); err != nil {
return multierror.Prefix(err, fmt.Sprintf(
"'%s', volume_mount ->", n))
return nil, multierror.Prefix(err, "volume_mount ->")
}
}