summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-26 01:32:36 -0700
committerGitHub <noreply@github.com>2018-10-26 01:32:36 -0700
commita2dc29746f354382a90956fcc3b47abf8a986fd9 (patch)
tree9ce5ce8dea1fd4eec3f635819b60b2cf875a1394 /cmd/podman
parentf6e7807fa5970f328c1221c2e0c0aafe5f1c4b34 (diff)
parentf641c2d9384ea5cbc3f2f6a4188d54c33a85c17b (diff)
downloadpodman-a2dc29746f354382a90956fcc3b47abf8a986fd9.tar.gz
podman-a2dc29746f354382a90956fcc3b47abf8a986fd9.tar.bz2
podman-a2dc29746f354382a90956fcc3b47abf8a986fd9.zip
Merge pull request #1716 from baude/rmallps
fix bug in rm -fa parallel deletes
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/ps.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index fa333f952..d63618e58 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -351,7 +351,9 @@ func psCmd(c *cli.Context) error {
// Output Namespace headers
fmt.Fprintf(w, "\n%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s", hid, hnames, nspid, nscgroup, nsipc, nsmnt, nsnet, nspidns, nsuserns, nsuts)
}
-
+ if len(pss) == 0 {
+ fmt.Fprint(w, "\n")
+ }
// Now iterate each container and output its information
for _, container := range pss {