0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #24755 from thaJeztah/fix-error-message

Browse source 
update "image delete" error to match actual behavior
This commit is contained in:
Brian Goff 2016-07-18 22:47:55 -04:00 committed by GitHub
commit f49fdb9d0b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/image_delete.go
View file

@ -375,7 +375,7 @@ func (daemon *Daemon) checkImageDeleteConflict(imgID image.ID, mask conflictType
if mask&conflictActiveReference != 0 && len(daemon.referenceStore.References(imgID)) > 0 { if mask&conflictActiveReference != 0 && len(daemon.referenceStore.References(imgID)) > 0 {
return &imageDeleteConflict{ return &imageDeleteConflict{
imgID: imgID, imgID: imgID,
message: "image is referenced in one or more repositories", message: "image is referenced in multiple repositories",
} }
} }

2
integration-cli/docker_cli_rmi_test.go
View file

@ -134,7 +134,7 @@ func (s *DockerSuite) TestRmiImgIDForce(c *check.C) {
// rmi tagged in multiple repos should have failed without force // rmi tagged in multiple repos should have failed without force
c.Assert(err, checker.NotNil) c.Assert(err, checker.NotNil)
// rmi tagged in multiple repos should have failed without force // rmi tagged in multiple repos should have failed without force
c.Assert(out, checker.Contains, "(must be forced) - image is referenced in one or more repositories", check.Commentf("out: %s; err: %v;", out, err)) c.Assert(out, checker.Contains, "(must be forced) - image is referenced in multiple repositories", check.Commentf("out: %s; err: %v;", out, err))
dockerCmd(c, "rmi", "-f", imgID) dockerCmd(c, "rmi", "-f", imgID)
{ {