Browse code

Remove "...already being pulled" messages

These don't get seen, so they are unnecessary.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

Aaron Lehmann authored on 2015/08/26 05:03:35
Showing 2 changed files
... ...
@@ -140,7 +140,6 @@ func (p *v1Puller) pullRepository(askedTag string) error {
140 140
 			// ensure no two downloads of the same image happen at the same time
141 141
 			broadcaster, found := p.poolAdd("pull", "img:"+img.ID)
142 142
 			if found {
143
-				out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Layer already being pulled by another client. Waiting.", nil))
144 143
 				broadcaster.Add(out)
145 144
 				broadcaster.Wait()
146 145
 				out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Download complete", nil))
... ...
@@ -248,7 +247,6 @@ func (p *v1Puller) pullImage(out io.Writer, imgID, endpoint string, token []stri
248 248
 		broadcaster, found := p.poolAdd("pull", "layer:"+id)
249 249
 		if found {
250 250
 			logrus.Debugf("Image (id: %s) pull is already running, skipping", id)
251
-			out.Write(p.sf.FormatProgress(stringid.TruncateID(imgID), "Layer already being pulled by another client. Waiting.", nil))
252 251
 			broadcaster.Add(out)
253 252
 			broadcaster.Wait()
254 253
 		} else {
... ...
@@ -76,7 +76,6 @@ func (p *v2Puller) pullV2Repository(tag string) (err error) {
76 76
 	broadcaster, found := p.poolAdd("pull", taggedName)
77 77
 	if found {
78 78
 		// Another pull of the same repository is already taking place; just wait for it to finish
79
-		p.config.OutStream.Write(p.sf.FormatStatus("", "Repository %s already being pulled by another client. Waiting.", p.repoInfo.CanonicalName))
80 79
 		broadcaster.Add(p.config.OutStream)
81 80
 		broadcaster.Wait()
82 81
 		return nil
... ...
@@ -122,7 +121,6 @@ func (p *v2Puller) download(di *downloadInfo) {
122 122
 
123 123
 	broadcaster, found := p.poolAdd("pull", "img:"+di.img.ID)
124 124
 	if found {
125
-		out.Write(p.sf.FormatProgress(stringid.TruncateID(di.img.ID), "Layer already being pulled by another client. Waiting.", nil))
126 125
 		broadcaster.Add(out)
127 126
 		broadcaster.Wait()
128 127
 		out.Write(p.sf.FormatProgress(stringid.TruncateID(di.img.ID), "Download complete", nil))