diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-06-14 12:41:38 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-14 19:03:51 +0000 |
| commit | cdb447bba2b00dfd8f473a38b75115d1cd6ee799 (patch) | |
| tree | ee81c3329232b7a133ae3bdb7ff89705da2f9710 | |
| parent | 8d5da78b0e3518c4ae4ccb1cd6a2c707bf08c49a (diff) | |
| download | podman-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
| -rw-r--r-- | cmd/podman/ps.go | 6 | ||||
| -rw-r--r-- | libpod/boltdb_state.go | 3 |
2 files changed, 7 insertions, 2 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]) diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index 805ff90fd..77a17ce12 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -620,7 +620,7 @@ func (s *BoltState) AllContainers() ([]*Container, error) { return err } - err = allCtrsBucket.ForEach(func(id, name []byte) error { + return allCtrsBucket.ForEach(func(id, name []byte) error { // If performance becomes an issue, this check can be // removed. But the error messages that come back will // be much less helpful. @@ -637,7 +637,6 @@ func (s *BoltState) AllContainers() ([]*Container, error) { return s.getContainerFromDB(id, ctr, ctrBucket) }) - return err }) if err != nil { return nil, err |