diff options
| author | baude <bbaude@redhat.com> | 2018-04-03 10:43:58 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-03 18:37:41 +0000 |
| commit | b1a8d769b84c52ea5ea74263cff6f582b1bdfcf0 (patch) | |
| tree | 790e3b39a5995951c8834d3a6229882149343e7a /cmd/podman/stop.go | |
| parent | 4640e7966769a128b30c2482cda8f3ef25eb77c9 (diff) | |
| download | podman-b1a8d769b84c52ea5ea74263cff6f582b1bdfcf0.tar.gz podman-b1a8d769b84c52ea5ea74263cff6f582b1bdfcf0.tar.bz2 podman-b1a8d769b84c52ea5ea74263cff6f582b1bdfcf0.zip | |
Stopping a stopped container should not be an error
Resolves: #575
Signed-off-by: baude <bbaude@redhat.com>
Closes: #588
Approved by: mheon
Diffstat (limited to 'cmd/podman/stop.go')
| -rw-r--r-- | cmd/podman/stop.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/stop.go b/cmd/podman/stop.go index 1d112ffe5..5bfa05708 100644 --- a/cmd/podman/stop.go +++ b/cmd/podman/stop.go @@ -101,7 +101,7 @@ func stopCmd(c *cli.Context) error { } else { stopTimeout = ctr.StopTimeout() } - if err := ctr.StopWithTimeout(stopTimeout); err != nil { + if err := ctr.StopWithTimeout(stopTimeout); err != nil && err != libpod.ErrCtrStopped { if lastError != nil { fmt.Fprintln(os.Stderr, lastError) } |