|
@@ -1011,16 +1011,9 @@ func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *ut
|
|
localName = remoteName
|
|
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
|
|
return err
|
|
}
|
|
}
|
|
- if err != nil {
|
|
|
|
- if err := srv.pullImage(r, out, remoteName, endpoint, nil, sf); err != nil {
|
|
|
|
- return err
|
|
|
|
- }
|
|
|
|
- return nil
|
|
|
|
- }
|
|
|
|
|
|
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|