Fixed 'docker inspect' to exit silently when an image doesn't exist

Upstream-commit: f37c432bd5fc40ee45b5d31ea750c59c544f2df5 Component: engine
2013-03-23 14:18:35 -07:00
parent 0a65e82434
commit 500d4f159a
1 changed files with 1 additions and 3 deletions
@@ -234,9 +234,7 @@ func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...str
 	var obj interface{}
 	if container := srv.runtime.Get(name); container != nil {
 		obj = container
-	} else if image, err := srv.runtime.repositories.LookupImage(name); err != nil {
-		return err
-	} else if image != nil {
+	} else if image, err := srv.runtime.repositories.LookupImage(name); err == nil && image != nil {
 		obj = image
 	} else {
 		// No output means the object does not exist