opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3348 from vrothberg/kill-error

Browse Source 
kill: print ID and state for non-running containers
This commit is contained in:
OpenShift Merge Robot
2019-06-17 15:31:51 +02:00
committed by GitHub
parent 670fc03088 04858a218f
commit 29be1764b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_api.go
View File

@ -180,7 +180,7 @@ func (c *Container) StopWithTimeout(timeout uint) error {
if c.state.State == ContainerStateConfigured || if c.state.State == ContainerStateConfigured ||
c.state.State == ContainerStateUnknown || c.state.State == ContainerStateUnknown ||
c.state.State == ContainerStatePaused { c.state.State == ContainerStatePaused {
return errors.Wrapf(ErrCtrStateInvalid, "can only stop created, running, or stopped containers. %s in state %s", c.ID(), c.state.State.String()) return errors.Wrapf(ErrCtrStateInvalid, "can only stop created, running, or stopped containers. %s is in state %s", c.ID(), c.state.State.String())
} }
if c.state.State == ContainerStateStopped || if c.state.State == ContainerStateStopped ||
@ -203,7 +203,7 @@ func (c *Container) Kill(signal uint) error {
} }
if c.state.State != ContainerStateRunning { if c.state.State != ContainerStateRunning {
return errors.Wrapf(ErrCtrStateInvalid, "can only kill running containers") return errors.Wrapf(ErrCtrStateInvalid, "can only kill running containers. %s is in state %s", c.ID(), c.state.State.String())
} }
defer c.newContainerEvent(events.Kill) defer c.newContainerEvent(events.Kill)