Merge pull request #47735 from cpuguy83/better_walk_error

neersighted · web-flow · commit 801fd16e3e48 · 2024-04-19T18:16:12.000-07:00
Include more details in errNotManifestOrIndex
diff --git a/daemon/containerd/image_manifest.go b/daemon/containerd/image_manifest.go
@@ -45,7 +45,7 @@ func (i *ImageService) walkImageManifests(ctx context.Context, img containerdima
 		return i.walkPresentChildren(ctx, desc, handleManifest)
 	}
 
-	return errNotManifestOrIndex
+	return errors.Wrapf(errNotManifestOrIndex, "error walking manifest for %s", img.Name)
 }
 
 type ImageManifest struct {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (i *ImageService) walkImageManifests(ctx context.Context, img containerdima`
`45`	`45`	`return i.walkPresentChildren(ctx, desc, handleManifest)`
`46`	`46`	`}`
`47`	`47`
`48`		`- return errNotManifestOrIndex`
	`48`	`+ return errors.Wrapf(errNotManifestOrIndex, "error walking manifest for %s", img.Name)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`type ImageManifest struct {`