diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-05 12:11:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 12:11:41 +0200 |
| commit | a9d572f40f006a69b9d0634afea142d37c071474 (patch) | |
| tree | b77c5a60e53e0173ad2840e4c0cb21792cbe8dbc /pkg/ps/ps.go | |
| parent | 7353000a06f3636515ebcd3b79ca8309db48b693 (diff) | |
| parent | 4a2c4c3989938ebc25a2d0d902aff51aaa5b6c45 (diff) | |
| download | podman-a9d572f40f006a69b9d0634afea142d37c071474.tar.gz podman-a9d572f40f006a69b9d0634afea142d37c071474.tar.bz2 podman-a9d572f40f006a69b9d0634afea142d37c071474.zip | |
Merge pull request #7909 from zhangguanzhang/remote-ps-ns-broken
Fix podman-remote ps --ns broken
Diffstat (limited to 'pkg/ps/ps.go')
| -rw-r--r-- | pkg/ps/ps.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 8087507e2..96b2d754f 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -134,15 +134,16 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities logrus.Errorf("error getting exited time for %q: %v", c.ID(), err) } + pid, err = c.PID() + if err != nil { + return errors.Wrapf(err, "unable to obtain container pid") + } + if !opts.Size && !opts.Namespace { return nil } if opts.Namespace { - pid, err = c.PID() - if err != nil { - return errors.Wrapf(err, "unable to obtain container pid") - } ctrPID := strconv.Itoa(pid) cgroup, _ = getNamespaceInfo(filepath.Join("/proc", ctrPID, "ns", "cgroup")) ipc, _ = getNamespaceInfo(filepath.Join("/proc", ctrPID, "ns", "ipc")) |