docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Correct the error message of pause and unpause non-running container

Browse Source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 20927ffbe7cf1f6bdc2f7eb17db2a443abacf4c0
Component: engine
This commit is contained in:
Lei Jitang
2015-05-31 03:32:29 +08:00
parent 7ca30cc398
commit 5fcdacd7a5
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/engine/daemon/container.go
View File

@@ -396,16 +396,16 @@ func (container *Container) Pause() error {
container.Lock()
defer container.Unlock()
// We cannot Pause the container which is not running
if !container.Running {
return fmt.Errorf("Container %s is not running, cannot pause a non-running container", container.ID)
}
// We cannot Pause the container which is already paused
if container.Paused {
return fmt.Errorf("Container %s is already paused", container.ID)
}
// We cannot Pause the container which is not running
if !container.Running {
return fmt.Errorf("Container %s is not running", container.ID)
}
if err := container.daemon.execDriver.Pause(container.command); err != nil {
return err
}
@@ -418,14 +418,14 @@ func (container *Container) Unpause() error {
container.Lock()
defer container.Unlock()
// We cannot unpause the container which is not paused
if !container.Paused {
return fmt.Errorf("Container %s is not paused, so what", container.ID)
}
// We cannot unpause the container which is not running
if !container.Running {
return fmt.Errorf("Container %s is not running", container.ID)
return fmt.Errorf("Container %s is not running, cannot unpause a non-running container", container.ID)
}
// We cannot unpause the container which is not paused
if !container.Paused {
return fmt.Errorf("Container %s is not paused", container.ID)
}
if err := container.daemon.execDriver.Unpause(container.command); err != nil {