diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-02 16:07:52 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-06 19:43:22 +0200 |
| commit | f2946da9e806c2bafbdd26707fe339db79bd980b (patch) | |
| tree | b5609317a861ea5f399e094e1b9287ca71dc22d1 /hugofs/rootmapping_fs.go | |
| parent | 6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (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/rootmapping_fs.go')
| -rw-r--r-- | hugofs/rootmapping_fs.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hugofs/rootmapping_fs.go b/hugofs/rootmapping_fs.go index a891ba8de..90df48f8c 100644 --- a/hugofs/rootmapping_fs.go +++ b/hugofs/rootmapping_fs.go @@ -21,8 +21,6 @@ import ( "github.com/gohugoio/hugo/hugofs/files" - "github.com/pkg/errors" - radix "github.com/armon/go-radix" "github.com/spf13/afero" ) @@ -191,7 +189,7 @@ func (fs *RootMappingFs) Dirs(base string) ([]FileMetaInfo, error) { fs = decorateDirs(fs, r.Meta) fi, err := fs.Stat("") if err != nil { - return nil, errors.Wrap(err, "RootMappingFs.Dirs") + return nil, fmt.Errorf("RootMappingFs.Dirs: %w", err) } if !fi.IsDir() { @@ -560,7 +558,7 @@ func (fs *RootMappingFs) doLstat(name string) ([]FileMetaInfo, error) { if fileCount > 1 { // Not supported by this filesystem. - return nil, errors.Errorf("found multiple files with name %q, use .Readdir or the source filesystem directly", name) + return nil, fmt.Errorf("found multiple files with name %q, use .Readdir or the source filesystem directly", name) } return []FileMetaInfo{roots[0].fi}, nil |