Merge pull request containerd#10471 from colinodell/include-path-in-error

kzys · web-flow · commit 3e5e5b4da9cc · 2024-07-16T17:02:13.000Z
Include file path in tar copy errors
diff --git a/pkg/archive/tar.go b/pkg/archive/tar.go
@@ -666,7 +666,7 @@ func (cw *ChangeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e
 
 			n, err := copyBuffered(context.TODO(), cw.tw, file)
 			if err != nil {
-				return fmt.Errorf("failed to copy: %w", err)
+				return fmt.Errorf("failed to copy: %v: %w", source, err)
 			}
 			if n != hdr.Size {
 				return errors.New("short write copying file")

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ func (cw *ChangeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e`
`666`	`666`
`667`	`667`	`n, err := copyBuffered(context.TODO(), cw.tw, file)`
`668`	`668`	`if err != nil {`
`669`		`- return fmt.Errorf("failed to copy: %w", err)`
	`669`	`+ return fmt.Errorf("failed to copy: %v: %w", source, err)`
`670`	`670`	`}`
`671`	`671`	`if n != hdr.Size {`
`672`	`672`	`return errors.New("short write copying file")`