diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-21 12:58:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:58:55 +0200 |
| commit | 11372c4c4d75d731f346c6be06e41bfe9600ce81 (patch) | |
| tree | 79a8f85f2f8ac32613ce86db3601b355595cf852 /pkg/ps/ps.go | |
| parent | 84180d99bc808795a1f91747436a42745ddececb (diff) | |
| parent | 7fc3c25410bd5ee053473ffd5df2209f41840ec0 (diff) | |
| download | podman-11372c4c4d75d731f346c6be06e41bfe9600ce81.tar.gz podman-11372c4c4d75d731f346c6be06e41bfe9600ce81.tar.bz2 podman-11372c4c4d75d731f346c6be06e41bfe9600ce81.zip | |
Merge pull request #7363 from mheon/lets_try_this_again
Lets try this again: v2.0.5 backports, round 2
Diffstat (limited to 'pkg/ps/ps.go')
| -rw-r--r-- | pkg/ps/ps.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 2b81311af..d4fd96596 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -175,11 +175,14 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities State: conState.String(), } if opts.Pod && len(conConfig.Pod) > 0 { - pod, err := rt.GetPod(conConfig.Pod) + podName, err := rt.GetName(conConfig.Pod) if err != nil { + if errors.Cause(err) == define.ErrNoSuchCtr { + return entities.ListContainer{}, errors.Wrapf(define.ErrNoSuchPod, "could not find container %s pod (id %s) in state", conConfig.ID, conConfig.Pod) + } return entities.ListContainer{}, err } - ps.PodName = pod.Name() + ps.PodName = podName } if opts.Namespace { |