Skip to content

Commit

Permalink
Merge pull request moby#6503 from LK4D4/verbose_parallel_error_pull_#…
Browse files Browse the repository at this point in the history
…6484

More verbose error for parallel pull
  • Loading branch information
Michael Crosby committed Jun 20, 2014
2 parents b2eb79b + 3303789 commit 189967a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions server/server.go
Original file line number Diff line number Diff line change
@@ -1236,9 +1236,10 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, localName
break
}
if !success {
out.Write(sf.FormatProgress(utils.TruncateID(img.ID), fmt.Sprintf("Error pulling image (%s) from %s, %s", img.Tag, localName, lastErr), nil))
err := fmt.Errorf("Error pulling image (%s) from %s, %v", img.Tag, localName, lastErr)
out.Write(sf.FormatProgress(utils.TruncateID(img.ID), err.Error(), nil))
if parallel {
errors <- fmt.Errorf("Could not find repository on any of the indexed registries.")
errors <- err
return
}
}

0 comments on commit 189967a

Please sign in to comment.