summaryrefslogtreecommitdiffstats
path: root/hugofs/walk.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-05-02 16:07:52 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-05-06 19:43:22 +0200
commitf2946da9e806c2bafbdd26707fe339db79bd980b (patch)
treeb5609317a861ea5f399e094e1b9287ca71dc22d1 /hugofs/walk.go
parent6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (diff)
Improve error messages, esp. when the server is running
* Add file context to minifier errors when publishing * Misc fixes (see issues) * Allow custom server error template in layouts/server/error.html To get to this, this commit also cleans up and simplifies the code surrounding errors and files. This also removes the usage of `github.com/pkg/errors`, mostly because of https://github.com/pkg/errors/issues/223 -- but also because most of this is now built-in to Go. Fixes #9852 Fixes #9857 Fixes #9863
Diffstat (limited to 'hugofs/walk.go')
-rw-r--r--hugofs/walk.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/hugofs/walk.go b/hugofs/walk.go
index 26f1b74e0..22a99402f 100644
--- a/hugofs/walk.go
+++ b/hugofs/walk.go
@@ -22,7 +22,7 @@ import (
"github.com/gohugoio/hugo/common/loggers"
- "github.com/pkg/errors"
+ "errors"
"github.com/spf13/afero"
)
@@ -125,7 +125,7 @@ func (w *Walkway) Walk() error {
if w.checkErr(w.root, err) {
return nil
}
- return w.walkFn(w.root, nil, errors.Wrapf(err, "walk: %q", w.root))
+ return w.walkFn(w.root, nil, fmt.Errorf("walk: %q: %w", w.root, err))
}
fi = info.(FileMetaInfo)
}
@@ -192,7 +192,7 @@ func (w *Walkway) walk(path string, info FileMetaInfo, dirEntries []FileMetaInfo
if w.checkErr(path, err) {
return nil
}
- return walkFn(path, info, errors.Wrapf(err, "walk: open %q (%q)", path, w.root))
+ return walkFn(path, info, fmt.Errorf("walk: open %q (%q): %w", path, w.root, err))
}
fis, err := f.Readdir(-1)
@@ -201,7 +201,7 @@ func (w *Walkway) walk(path string, info FileMetaInfo, dirEntries []FileMetaInfo
if w.checkErr(filename, err) {
return nil
}
- return walkFn(path, info, errors.Wrap(err, "walk: Readdir"))
+ return walkFn(path, info, fmt.Errorf("walk: Readdir: %w", err))
}
dirEntries = fileInfosToFileMetaInfos(fis)