kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix typo in pullImage

Browse source
This commit is contained in:
Paul Morie 2013-11-21 17:29:03 -05:00
parent bcdeb37bb6
commit 3f17844b6e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server.go
View file

@ -759,7 +759,7 @@ func (srv *Server) pullImage(r *registry.Registry, out io.Writer, imgID, endpoin
if err != nil { if err != nil {
return err return err
} }
out.Write(sf.FormatProgress(utils.TruncateID(imgID), "Pulling", "dependend layers")) out.Write(sf.FormatProgress(utils.TruncateID(imgID), "Pulling", "dependent layers"))
// FIXME: Try to stream the images? // FIXME: Try to stream the images?
// FIXME: Launch the getRemoteImage() in goroutines // FIXME: Launch the getRemoteImage() in goroutines
@ -776,13 +776,13 @@ func (srv *Server) pullImage(r *registry.Registry, out io.Writer, imgID, endpoin
out.Write(sf.FormatProgress(utils.TruncateID(id), "Pulling", "metadata")) out.Write(sf.FormatProgress(utils.TruncateID(id), "Pulling", "metadata"))
imgJSON, imgSize, err := r.GetRemoteImageJSON(id, endpoint, token) imgJSON, imgSize, err := r.GetRemoteImageJSON(id, endpoint, token)
if err != nil { if err != nil {
out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "pulling dependend layers")) out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "pulling dependent layers"))
// FIXME: Keep going in case of error? // FIXME: Keep going in case of error?
return err return err
} }
img, err := NewImgJSON(imgJSON) img, err := NewImgJSON(imgJSON)
if err != nil { if err != nil {
out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "pulling dependend layers")) out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "pulling dependent layers"))
return fmt.Errorf("Failed to parse json: %s", err) return fmt.Errorf("Failed to parse json: %s", err)
} }
@ -790,12 +790,12 @@ func (srv *Server) pullImage(r *registry.Registry, out io.Writer, imgID, endpoin
out.Write(sf.FormatProgress(utils.TruncateID(id), "Pulling", "fs layer")) out.Write(sf.FormatProgress(utils.TruncateID(id), "Pulling", "fs layer"))
layer, err := r.GetRemoteImageLayer(img.ID, endpoint, token) layer, err := r.GetRemoteImageLayer(img.ID, endpoint, token)
if err != nil { if err != nil {
out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "pulling dependend layers")) out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "pulling dependent layers"))
return err return err
} }
defer layer.Close() defer layer.Close()
if err := srv.runtime.graph.Register(imgJSON, utils.ProgressReader(layer, imgSize, out, sf.FormatProgress(utils.TruncateID(id), "Downloading", "%8v/%v (%v)"), sf, false), img); err != nil { if err := srv.runtime.graph.Register(imgJSON, utils.ProgressReader(layer, imgSize, out, sf.FormatProgress(utils.TruncateID(id), "Downloading", "%8v/%v (%v)"), sf, false), img); err != nil {
out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "downloading dependend layers")) out.Write(sf.FormatProgress(utils.TruncateID(id), "Error", "downloading dependent layers"))
return err return err
} }
} }