diff options
| author | Andrew C. Bodine <acbodine@us.ibm.com> | 2014-12-16 15:06:35 -0800 |
|---|---|---|
| committer | Andrew C. Bodine <acbodine@us.ibm.com> | 2015-01-21 17:11:31 -0800 |
| commit | d25a65375c880017ac0c516389b0b7afde810517 (patch) | |
| tree | 43a0f04bd59988430d535acc7164cc74de3999bb /daemon/rename.go | |
| parent | fcc4abc870e7f62590e418f10ff6f743a47fad12 (diff) | |
| download | docker-d25a65375c880017ac0c516389b0b7afde810517.tar.gz | |
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Diffstat (limited to 'daemon/rename.go')
| -rw-r--r-- | daemon/rename.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/daemon/rename.go b/daemon/rename.go index 1dedc7d3a7..3d315252ae 100644 --- a/daemon/rename.go +++ b/daemon/rename.go @@ -11,9 +11,9 @@ func (daemon *Daemon) ContainerRename(job *engine.Job) engine.Status { oldName := job.Args[0] newName := job.Args[1] - container := daemon.Get(oldName) - if container == nil { - return job.Errorf("No such container: %s", oldName) + container, err := daemon.Get(oldName) + if err != nil { + return job.Error(err) } oldName = container.Name |