diff options
| author | baude <bbaude@redhat.com> | 2018-01-17 15:11:41 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-18 18:32:10 +0000 |
| commit | 05317d8f914f2ecf16852c8d4a571c4734a39290 (patch) | |
| tree | e6a04babe0d544863c85a1333d83092182176b87 /cmd/podman | |
| parent | 1d7884b9a4f8c22bfcd2c4b76ce27de7ba949e79 (diff) | |
| download | podman-05317d8f914f2ecf16852c8d4a571c4734a39290.tar.gz podman-05317d8f914f2ecf16852c8d4a571c4734a39290.tar.bz2 podman-05317d8f914f2ecf16852c8d4a571c4734a39290.zip | |
Fix output for created containers
Created containers that haven't hit runc yet should still
be considered created (not dead).
Also, fixed loop for deleting containers as leftover code
still exited there that prevented proper deletion of containers
that could be deleted.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #238
Approved by: rhatdan
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/ps.go | 2 | ||||
| -rw-r--r-- | cmd/podman/rm.go | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index c674c9d1e..944664c68 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -412,7 +412,7 @@ func getTemplateOutput(containers []*libpod.Container, opts psOptions) ([]psTemp status = "Up " + runningFor + " ago" case libpod.ContainerStatePaused: status = "Paused" - case libpod.ContainerStateCreated: + case libpod.ContainerStateCreated, libpod.ContainerStateConfigured: status = "Created" default: status = "Dead" diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 8dd3475c0..182089e8e 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -80,13 +80,6 @@ func rmCmd(c *cli.Context) error { } } for _, container := range delContainers { - if err != nil { - if lastError != nil { - fmt.Fprintln(os.Stderr, lastError) - } - lastError = errors.Wrapf(err, "failed to find container %s", container.ID()) - continue - } err = runtime.RemoveContainer(container, c.Bool("force")) if err != nil { if lastError != nil { |