瀏覽代碼

hot fix display in parallel pull and go fmt

Victor Vieux 12 年之前
父節點
當前提交
d7979ef2d0
共有 3 個文件被更改,包括 2 次插入3 次删除
  1. 0 1
      registry/registry.go
  2. 1 1
      registry/registry_mock_test.go
  3. 1 1
      utils/utils.go

+ 0 - 1
registry/registry.go

@@ -162,7 +162,6 @@ func (r *Registry) GetRemoteHistory(imgID, registry string, token []string) ([]s
 // Check if an image exists in the Registry
 func (r *Registry) LookupRemoteImage(imgID, registry string, token []string) bool {
 
-
 	req, err := r.reqFactory.NewRequest("GET", registry+"images/"+imgID+"/json", nil)
 	if err != nil {
 		return false

+ 1 - 1
registry/registry_mock_test.go

@@ -343,4 +343,4 @@ func TestWait(t *testing.T) {
 	<-c
 }
 
-//*/
+//*/

+ 1 - 1
utils/utils.go

@@ -645,6 +645,7 @@ func (jm *JSONMessage) Display(out io.Writer) error {
 		}
 		return jm.Error
 	}
+	fmt.Fprintf(out, "%c[2K\r", 27)
 	if jm.Time != 0 {
 		fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0))
 	}
@@ -655,7 +656,6 @@ func (jm *JSONMessage) Display(out io.Writer) error {
 		fmt.Fprintf(out, "(from %s) ", jm.From)
 	}
 	if jm.Progress != "" {
-		fmt.Fprintf(out, "%c[2K", 27)
 		fmt.Fprintf(out, "%s %s\r", jm.Status, jm.Progress)
 	} else {
 		fmt.Fprintf(out, "%s\r\n", jm.Status)