summaryrefslogtreecommitdiff
path: root/template.go
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2023-11-19 21:07:26 -0500
committerGitHub <noreply@github.com>2023-11-20 02:07:26 +0000
commit5c813db5f9c7cd7843895ee289a991ee948103f6 (patch)
tree30cbbce89279e0423e1f90c066b108a8ef184662 /template.go
parentf02b5c4a8ac9127f889b9ef713218335d5146e00 (diff)
Fix the wdFS behaviour due to Go 1.21.4's changes to IsAbs (#1915)
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'template.go')
-rw-r--r--template.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/template.go b/template.go
index 7aad0694..66fc4e54 100644
--- a/template.go
+++ b/template.go
@@ -90,7 +90,12 @@ func parseNestedTemplates(ctx context.Context, nested config.Templates, tmpl *te
}
// TODO: maybe need to do something with root here?
- if _, reldir := datafs.ResolveLocalPath(u.Path); reldir != "" && reldir != "." {
+ _, reldir, err := datafs.ResolveLocalPath(u.Path)
+ if err != nil {
+ return fmt.Errorf("resolveLocalPath: %w", err)
+ }
+
+ if reldir != "" && reldir != "." {
fsys, err = fs.Sub(fsys, reldir)
if err != nil {
return fmt.Errorf("sub filesystem for %q unavailable: %w", &u, err)
@@ -220,7 +225,10 @@ func walkDir(ctx context.Context, cfg *config.Config, dir string, outFileNamer f
// we need dir to be relative to the root of fsys
// TODO: maybe need to do something with root here?
- _, reldir := datafs.ResolveLocalPath(dir)
+ _, reldir, err := datafs.ResolveLocalPath(dir)
+ if err != nil {
+ return nil, fmt.Errorf("resolveLocalPath: %w", err)
+ }
subfsys, err := fs.Sub(fsys, reldir)
if err != nil {