From fe64f8a242b69b8af7679951106ac9161243937a Mon Sep 17 00:00:00 2001 From: Danny Yates Date: Tue, 17 Dec 2013 12:31:35 +0000 Subject: [PATCH] Improve error message when refusing to remove image due to multiple repo tags Upstream-commit: c3705e83e7eac1e67dbb9c6fc354063bbe43eae6 Component: engine --- components/engine/docs/sources/commandline/cli.rst | 2 +- components/engine/server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/docs/sources/commandline/cli.rst b/components/engine/docs/sources/commandline/cli.rst index 9b1db93556..ec69fc1c86 100644 --- a/components/engine/docs/sources/commandline/cli.rst +++ b/components/engine/docs/sources/commandline/cli.rst @@ -952,7 +952,7 @@ image is removed. test2 latest fd484f19954f 23 seconds ago 7 B (virtual 4.964 MB) $ sudo docker rmi fd484f19954f - Error: Conflict, fd484f19954f wasn't deleted + Error: Conflict, cannot delete image fd484f19954f because it is tagged in multiple repositories 2013/12/11 05:47:16 Error: failed to remove one or more images $ sudo docker rmi test1 diff --git a/components/engine/server.go b/components/engine/server.go index 9b492a2927..85f3a7465f 100644 --- a/components/engine/server.go +++ b/components/engine/server.go @@ -1567,7 +1567,7 @@ func (srv *Server) deleteImage(img *Image, repoName, tag string) ([]APIRmi, erro } else if repoName != parsedRepo { // the id belongs to multiple repos, like base:latest and user:test, // in that case return conflict - return imgs, nil + return nil, fmt.Errorf("Conflict, cannot delete image %s because it is tagged in multiple repositories", utils.TruncateID(img.ID)) } } } else {