Merge pull request containerd#9649 from dims/include-image-name-in-error-message

dims · web-flow · commit aad37698ed90 · 2024-01-17T12:19:40.000Z
include image name in error message
diff --git a/client/image.go b/client/image.go
@@ -335,7 +335,7 @@ func (i *image) Unpack(ctx context.Context, snapshotterName string, opts ...Unpa
 	for _, layer := range layers {
 		unpacked, err = rootfs.ApplyLayerWithOpts(ctx, layer, chain, sn, a, config.SnapshotOpts, config.ApplyOpts)
 		if err != nil {
-			return err
+			return fmt.Errorf("apply layer error for %q: %w", i.Name(), err)
 		}
 
 		if unpacked {

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ func (i *image) Unpack(ctx context.Context, snapshotterName string, opts ...Unpa`
`335`	`335`	`for _, layer := range layers {`
`336`	`336`	`unpacked, err = rootfs.ApplyLayerWithOpts(ctx, layer, chain, sn, a, config.SnapshotOpts, config.ApplyOpts)`
`337`	`337`	`if err != nil {`
`338`		`- return err`
	`338`	`+ return fmt.Errorf("apply layer error for %q: %w", i.Name(), err)`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`if unpacked {`