containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11476 from vrothberg/fix-11392 

container inspect: improve error handling
This commit is contained in:
OpenShift Merge Robot 2021-09-08 16:57:23 +02:00 committed by GitHub
parent 558ba1b99e 6aa666a27c
commit d68e429859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/domain/infra/abi/containers.go
View File

@ -371,7 +371,7 @@ func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []st
if options.Latest { if options.Latest {
ctr, err := ic.Libpod.GetLatestContainer() ctr, err := ic.Libpod.GetLatestContainer()
if err != nil { if err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr { if errors.Is(err, define.ErrNoSuchCtr) {
return nil, []error{errors.Wrapf(err, "no containers to inspect")}, nil return nil, []error{errors.Wrapf(err, "no containers to inspect")}, nil
} }
return nil, nil, err return nil, nil, err
@ -397,7 +397,7 @@ func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []st
if err != nil { if err != nil {
// ErrNoSuchCtr is non-fatal, other errors will be // ErrNoSuchCtr is non-fatal, other errors will be
// treated as fatal. // treated as fatal.
if errors.Cause(err) == define.ErrNoSuchCtr { if errors.Is(err, define.ErrNoSuchCtr) {
errs = append(errs, errors.Errorf("no such container %s", name)) errs = append(errs, errors.Errorf("no such container %s", name))
continue continue
} }
@ -406,6 +406,12 @@ func (ic *ContainerEngine) ContainerInspect(ctx context.Context, namesOrIds []st
inspect, err := ctr.Inspect(options.Size) inspect, err := ctr.Inspect(options.Size)
if err != nil { if err != nil {
// ErrNoSuchCtr is non-fatal, other errors will be
// treated as fatal.
if errors.Is(err, define.ErrNoSuchCtr) {
errs = append(errs, errors.Errorf("no such container %s", name))
continue
}
return nil, nil, err return nil, nil, err
} }