From d47507791e14908e78cf38d415a9863c9ef75c5e Mon Sep 17 00:00:00 2001
From: Danny Yates <danny@codeaholics.org>
Date: Thu, 28 Nov 2013 16:42:29 +0000
Subject: [PATCH] Stop invalid calls to Registry

This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
---
 server.go | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/server.go b/server.go
index 3641e2fdc8..b4635c8444 100644
--- a/server.go
+++ b/server.go
@@ -1011,16 +1011,9 @@ func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *ut
 		localName = remoteName
 	}
 
-	err = srv.pullRepository(r, out, localName, remoteName, tag, endpoint, sf, parallel)
-	if err == registry.ErrLoginRequired {
+	if err = srv.pullRepository(r, out, localName, remoteName, tag, endpoint, sf, parallel); err != nil {
 		return err
 	}
-	if err != nil {
-		if err := srv.pullImage(r, out, remoteName, endpoint, nil, sf); err != nil {
-			return err
-		}
-		return nil
-	}
 
 	return nil
 }