kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Make docker tag error message more user friendly 

Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
This commit is contained in:
Shishir Mahajan 2015-10-05 14:39:31 -04:00
parent 072ac5e7f0
commit 582a24e937
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graph/tags.go
View File

@ -301,7 +301,7 @@ func (store *TagStore) setLoad(repoName, tag, imageName string, force bool, out
if old, exists := store.Repositories[repoName][tag]; exists {
if !force {
return fmt.Errorf("Conflict: Tag %s is already set to image %s, if you want to replace it, please use -f option", tag, old)
return fmt.Errorf("Conflict: Tag %s:%s is already set to image %s, if you want to replace it, please use -f option", repoName, tag, old[:12])
}
if old != img.ID && out != nil {

2
integration-cli/docker_cli_tag_test.go
View File

@ -80,7 +80,7 @@ func (s *DockerSuite) TestTagExistedNameWithoutForce(c *check.C) {
dockerCmd(c, "tag", "busybox:latest", "busybox:test")
out, _, err := dockerCmdWithError("tag", "busybox:latest", "busybox:test")
if err == nil || !strings.Contains(out, "Conflict: Tag test is already set to image") {
if err == nil || !strings.Contains(out, "Conflict: Tag busybox:test is already set to image") {
c.Fatal("tag busybox busybox:test should have failed,because busybox:test is existed")
}
}