From 05317d8f914f2ecf16852c8d4a571c4734a39290 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 17 Jan 2018 15:11:41 -0600 Subject: 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 Closes: #238 Approved by: rhatdan --- cmd/podman/ps.go | 2 +- cmd/podman/rm.go | 7 ------- 2 files changed, 1 insertion(+), 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 { -- cgit v1.2.3-54-g00ecf