Merge pull request #2941 from codeaholics/2940-invalid-registry-calls

Stop invalid calls to Registry
This commit is contained in:
Victor Vieux 2013-11-28 17:00:22 -08:00
Родитель 668d22be54 d47507791e
Коммит cca9e51f5d
1 изменённых файлов: 1 добавлений и 8 удалений

Просмотреть файл

@ -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
}