Merge pull request moby#5657 from fiam/alberto/annotate-new-from-stat-error

crazy-max · web-flow · commit a617d0e44f94 · 2025-01-15T14:54:30.000+01:00
chore: annotate errors returned from NewFromStat() with the file path
diff --git a/cache/contenthash/filehash.go b/cache/contenthash/filehash.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/pkg/errors"
 	fstypes "github.com/tonistiigi/fsutil/types"
 )
 
@@ -46,7 +47,7 @@ func NewFromStat(stat *fstypes.Stat) (hash.Hash, error) {
 	fi := &statInfo{stat}
 	hdr, err := tar.FileInfoHeader(fi, stat.Linkname)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrapf(err, "failed to checksum file %s", stat.Path)
 	}
 	hdr.Name = "" // note: empty name is different from current has in docker build. Name is added on recursive directory scan instead
 	hdr.Devmajor = stat.Devmajor

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"path/filepath"`
`9`	`9`	`"time"`
`10`	`10`
	`11`	`+ "github.com/pkg/errors"`
`11`	`12`	`fstypes "github.com/tonistiigi/fsutil/types"`
`12`	`13`	`)`
`13`	`14`
`@@ -46,7 +47,7 @@ func NewFromStat(stat *fstypes.Stat) (hash.Hash, error) {`
`46`	`47`	`fi := &statInfo{stat}`
`47`	`48`	`hdr, err := tar.FileInfoHeader(fi, stat.Linkname)`
`48`	`49`	`if err != nil {`
`49`		`- return nil, err`
	`50`	`+ return nil, errors.Wrapf(err, "failed to checksum file %s", stat.Path)`
`50`	`51`	`}`
`51`	`52`	`hdr.Name = "" // note: empty name is different from current has in docker build. Name is added on recursive directory scan instead`
`52`	`53`	`hdr.Devmajor = stat.Devmajor`