Skip to content

Commit d475077

Browse files
committed
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.
1 parent 597ca19 commit d475077

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

server.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,16 +1011,9 @@ func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *ut
10111011
localName = remoteName
10121012
}
10131013

1014-
err = srv.pullRepository(r, out, localName, remoteName, tag, endpoint, sf, parallel)
1015-
if err == registry.ErrLoginRequired {
1014+
if err = srv.pullRepository(r, out, localName, remoteName, tag, endpoint, sf, parallel); err != nil {
10161015
return err
10171016
}
1018-
if err != nil {
1019-
if err := srv.pullImage(r, out, remoteName, endpoint, nil, sf); err != nil {
1020-
return err
1021-
}
1022-
return nil
1023-
}
10241017

10251018
return nil
10261019
}

0 commit comments

Comments
 (0)