diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-11 21:35:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 21:35:45 +0200 |
| commit | d614372c2f39cea32641ec92c84a9e48657cfb41 (patch) | |
| tree | 032338943b478c70e6ded7c103cea0311481cca8 /cmd/podman/ps.go | |
| parent | 2b64f8844655b7188332a404ec85d32c33feb9e9 (diff) | |
| parent | a78c885397ad2938b9b21438bcfa8a00dd1eb03f (diff) | |
| download | podman-d614372c2f39cea32641ec92c84a9e48657cfb41.tar.gz podman-d614372c2f39cea32641ec92c84a9e48657cfb41.tar.bz2 podman-d614372c2f39cea32641ec92c84a9e48657cfb41.zip | |
Merge pull request #3552 from baude/golangcilint2
golangci-lint pass number 2
Diffstat (limited to 'cmd/podman/ps.go')
| -rw-r--r-- | cmd/podman/ps.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index 26cc55e5f..9fad0ea65 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -319,6 +319,9 @@ func psDisplay(c *cliconfig.PsValues, runtime *adapter.LocalRuntime) error { } pss, err := runtime.Ps(c, opts) + if err != nil { + return err + } // Here and down if opts.Sort != "" { pss, err = sortPsOutput(opts.Sort, pss) @@ -376,8 +379,8 @@ func psDisplay(c *cliconfig.PsValues, runtime *adapter.LocalRuntime) error { size = units.HumanSizeWithPrecision(0, 0) } else { size = units.HumanSizeWithPrecision(float64(container.Size.RwSize), 3) + " (virtual " + units.HumanSizeWithPrecision(float64(container.Size.RootFsSize), 3) + ")" - fmt.Fprintf(w, "\t%s", size) } + fmt.Fprintf(w, "\t%s", size) } } else { |