Skip to content

Commit

Permalink
Avoid duplicate filename in template errors
Browse files Browse the repository at this point in the history
  • Loading branch information
twpayne committed Jan 11, 2019
1 parent 17a590c commit 9c6cedf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/chezmoi/target_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ func (ts *TargetState) executeTemplate(fs vfs.FS, path string) ([]byte, error) {
func (ts *TargetState) executeTemplateData(name string, data []byte) (_ []byte, err error) {
tmpl, err := template.New(name).Option("missingkey=error").Funcs(ts.Funcs).Parse(string(data))
if err != nil {
return nil, fmt.Errorf("%s: %v", name, err)
return nil, err
}
defer func() {
if r := recover(); r != nil {
Expand All @@ -471,7 +471,7 @@ func (ts *TargetState) executeTemplateData(name string, data []byte) (_ []byte,
}()
output := &bytes.Buffer{}
if err = tmpl.Execute(output, ts.Data); err != nil {
return nil, fmt.Errorf("%s: %v", name, err)
return nil, err
}
return output.Bytes(), nil
}
Expand Down

0 comments on commit 9c6cedf

Please sign in to comment.