actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-03-17 07:57:37 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: preserve include directive in output on error in ProcessIncludes

Browse Source 
All error paths in the ReplaceAllFunc callback returned nil, which
ReplaceAllFunc treats as an empty replacement, silently erasing the
guard (if err != nil) fired, every subsequent include in the file
was also erased. Return spec (the original directive bytes) instead
so failed includes are preserved and subsequent ones are not lost.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Manuel Rüger 2026-03-13 01:50:45 +01:00
parent 4c81c81fb3
commit fef39dc1e0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/templates.go
View File

@ -113,7 +113,7 @@ func ProcessIncludes(
contents, contents,
func(spec []byte) []byte { func(spec []byte) []byte {
if err != nil { if err != nil {
return nil return spec
} }
groups := reIncludeDirective.FindSubmatch(spec) groups := reIncludeDirective.FindSubmatch(spec)
@ -143,7 +143,7 @@ func ProcessIncludes(
"unable to unmarshal template data config", "unable to unmarshal template data config",
) )
return nil return spec
} }
log.Tracef(vardump(facts, data), "including template %q", path) log.Tracef(vardump(facts, data), "including template %q", path)
@ -151,7 +151,7 @@ func ProcessIncludes(
templates, err = LoadTemplate(base, includePath, path, left, right, templates) templates, err = LoadTemplate(base, includePath, path, left, right, templates)
if err != nil { if err != nil {
err = facts.Format(err, "unable to load template") err = facts.Format(err, "unable to load template")
return nil return spec
} }
var buffer bytes.Buffer var buffer bytes.Buffer
@ -163,7 +163,7 @@ func ProcessIncludes(
"unable to execute template", "unable to execute template",
) )
return nil return spec
} }
recurse = true recurse = true