From b45e8fa945f9c8ba1fa5ef5ae15a9c2e51a3c926 Mon Sep 17 00:00:00 2001
From: William Henry <whenry@redhat.com>
Date: Tue, 15 Jul 2014 15:56:48 -0600
Subject: [PATCH] Change HTTP code: 404 to a more user friendly Image Not found
 msg

Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
---
 server/server.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/server.go b/server/server.go
index 114a3bf46d..1bc679ccd7 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1195,7 +1195,12 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, localName
 
 	repoData, err := r.GetRepositoryData(remoteName)
 	if err != nil {
-		return err
+		if strings.Contains(err.Error(), "HTTP code: 404") {
+			return fmt.Errorf("Error: image %s not found", remoteName)
+		} else {
+			// Unexpected HTTP error
+			return err
+		}
 	}
 
 	utils.Debugf("Retrieving the tag list")