opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments and fix ps output

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon
2018-09-24 09:53:08 -04:00
parent 2c7f97d5a7
commit 29dbab6440
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/ps.go
View File

@ -548,6 +548,8 @@ func getTemplateOutput(psParams []psJSONParams, opts shared.PsOptions) ([]psTemp
labels := formatLabels(psParam.Labels) labels := formatLabels(psParam.Labels)
switch psParam.Status { switch psParam.Status {
case libpod.ContainerStateExited.String():
fallthrough
case libpod.ContainerStateStopped.String(): case libpod.ContainerStateStopped.String():
exitedSince := units.HumanDuration(time.Since(psParam.ExitedAt)) exitedSince := units.HumanDuration(time.Since(psParam.ExitedAt))
status = fmt.Sprintf("Exited (%d) %s ago", psParam.ExitCode, exitedSince) status = fmt.Sprintf("Exited (%d) %s ago", psParam.ExitCode, exitedSince)

6
libpod/runtime_ctr.go
View File

@ -332,9 +332,9 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool)
label.ReleaseLabel(c.ProcessLabel()) label.ReleaseLabel(c.ProcessLabel())
r.reserveLabels() r.reserveLabels()
} }
// Delete the container // Delete the container.
// Only do this if we're not ContainerStateConfigured - if we are, // Not needed in Configured and Exited states, where the container
// we haven't been created in the runtime yet // doesn't exist in the runtime
if c.state.State != ContainerStateConfigured && if c.state.State != ContainerStateConfigured &&
c.state.State != ContainerStateExited { c.state.State != ContainerStateExited {
if err := c.delete(ctx); err != nil { if err := c.delete(ctx); err != nil {