From 96426bf691a712f8d6ad5b7e338ba9dab151d128 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Wed, 13 Mar 2013 13:48:00 -0700
Subject: [PATCH] Improved output of 'docker inspect' Upstream-commit:
 ce20fbfff64e682f5ddbe4c3e02995f1eaa2be71 Component: engine

---
 components/engine/commands/commands.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/engine/commands/commands.go b/components/engine/commands/commands.go
index 195ba21114..afeb6d30e1 100644
--- a/components/engine/commands/commands.go
+++ b/components/engine/commands/commands.go
@@ -313,7 +313,9 @@ func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...str
 	} else if image != nil {
 		obj = image
 	} else {
-		return errors.New("No such container or image: " + name)
+		// No output means the object does not exist
+		// (easier to script since stdout and stderr are not differentiated atm)
+		return nil
 	}
 	data, err := json.Marshal(obj)
 	if err != nil {
@@ -326,6 +328,7 @@ func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...str
 	if _, err := io.Copy(stdout, indented); err != nil {
 		return err
 	}
+	stdout.Write([]byte{'\n'})
 	return nil
 }