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 /common/hugio | |
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 'common/hugio')
-rw-r--r-- | common/hugio/copy.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/hugio/copy.go b/common/hugio/copy.go index be4506f4c..7c52f8723 100644 --- a/common/hugio/copy.go +++ b/common/hugio/copy.go @@ -14,13 +14,12 @@ package hugio import ( + "fmt" "io" "io/ioutil" "os" "path/filepath" - "github.com/pkg/errors" - "github.com/spf13/afero" ) @@ -60,7 +59,7 @@ func CopyDir(fs afero.Fs, from, to string, shouldCopy func(filename string) bool } if !fi.IsDir() { - return errors.Errorf("%q is not a directory", from) + return fmt.Errorf("%q is not a directory", from) } err = fs.MkdirAll(to, 0777) // before umask |