github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Image.IsUnpacked(): make error-handling more iodiomatic

Browse Source 
Check for "err != nil" instead of "err == nil".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-05-30 12:46:14 +02:00
parent 54658a1152
commit 94f0af3ece
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
image.go
View File

@ -58,7 +58,7 @@ type Image interface {
Usage(context.Context, ...UsageOpt) (int64, error) Usage(context.Context, ...UsageOpt) (int64, error)
// Config descriptor for the image. // Config descriptor for the image.
Config(ctx context.Context) (ocispec.Descriptor, error) Config(ctx context.Context) (ocispec.Descriptor, error)
// IsUnpacked returns whether or not an image is unpacked. // IsUnpacked returns whether an image is unpacked.
IsUnpacked(context.Context, string) (bool, error) IsUnpacked(context.Context, string) (bool, error)
// ContentStore provides a content store which contains image blob data // ContentStore provides a content store which contains image blob data
ContentStore() content.Store ContentStore() content.Store
@ -285,15 +285,14 @@ func (i *image) IsUnpacked(ctx context.Context, snapshotterName string) (bool, e
return false, err return false, err
} }
chainID := identity.ChainID(diffs) if _, err := sn.Stat(ctx, identity.ChainID(diffs).String()); err != nil {
_, err = sn.Stat(ctx, chainID.String()) if errdefs.IsNotFound(err) {
if err == nil { return false, nil
return true, nil }
} else if !errdefs.IsNotFound(err) {
return false, err return false, err
} }
return false, nil return true, nil
} }
func (i *image) Spec(ctx context.Context) (ocispec.Image, error) { func (i *image) Spec(ctx context.Context) (ocispec.Image, error) {