summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-06-14 12:41:38 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-14 19:03:51 +0000
commitcdb447bba2b00dfd8f473a38b75115d1cd6ee799 (patch)
treeee81c3329232b7a133ae3bdb7ff89705da2f9710 /cmd/podman
parent8d5da78b0e3518c4ae4ccb1cd6a2c707bf08c49a (diff)
downloadpodman-cdb447bba2b00dfd8f473a38b75115d1cd6ee799.tar.gz
podman-cdb447bba2b00dfd8f473a38b75115d1cd6ee799.tar.bz2
podman-cdb447bba2b00dfd8f473a38b75115d1cd6ee799.zip
Correctly report errors retrieving containers in ps
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #944 Approved by: rhatdan
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/ps.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index ca20f3f33..aa544e6d1 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -200,6 +200,12 @@ func psCmd(c *cli.Context) error {
}
containers, err := runtime.GetContainers(filterFuncs...)
+ if err != nil {
+ return err
+ }
+
+ // TODO: Latest and Last are broken right now due to lack of container
+ // ordering
var outputContainers []*libpod.Container
if opts.Latest && len(containers) > 0 {
outputContainers = append(outputContainers, containers[0])