From 9c6cedfc38b35ccaf206e7caea2d391772d87256 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sat, 12 Jan 2019 00:11:35 +0100 Subject: [PATCH] Avoid duplicate filename in template errors --- lib/chezmoi/target_state.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chezmoi/target_state.go b/lib/chezmoi/target_state.go index 95bd0b57321..8776949a51f 100644 --- a/lib/chezmoi/target_state.go +++ b/lib/chezmoi/target_state.go @@ -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 { @@ -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 }