From a82a6bfdffed4453a99c2d42b6646cab3a234569 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume@dotcloud.com>
Date: Wed, 15 May 2013 13:22:57 -0700
Subject: [PATCH] Upload images only when necessary

---
 docs/registry.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/registry.go b/docs/registry.go
index 03e977c3..d79b3e9f 100644
--- a/docs/registry.go
+++ b/docs/registry.go
@@ -3,6 +3,7 @@ package registry
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/dotcloud/docker/auth"
 	"github.com/dotcloud/docker/utils"
@@ -14,6 +15,8 @@ import (
 	"strings"
 )
 
+var ErrAlreadyExists error = errors.New("Image already exists")
+
 func doWithCookies(c *http.Client, req *http.Request) (*http.Response, error) {
 	for _, cookie := range c.Jar.Cookies(req.URL) {
 		req.AddCookie(cookie)
@@ -291,15 +294,13 @@ func (r *Registry) PushImageJsonRegistry(imgData *ImgData, jsonRaw []byte, regis
 	if res.StatusCode != 200 {
 		errBody, err := ioutil.ReadAll(res.Body)
 		if err != nil {
-			return fmt.Errorf("HTTP code %d while uploading metadata and error when"+
-				" trying to parse response body: %v", res.StatusCode, err)
+			return fmt.Errorf("HTTP code %d while uploading metadata and error when trying to parse response body: %s", res.StatusCode, err)
 		}
 		var jsonBody map[string]string
 		if err := json.Unmarshal(errBody, &jsonBody); err != nil {
 			errBody = []byte(err.Error())
 		} else if jsonBody["error"] == "Image already exists" {
-			utils.Debugf("Image %s already uploaded ; skipping\n", imgData.Id)
-			return nil
+			return ErrAlreadyExists
 		}
 		return fmt.Errorf("HTTP code %d while uploading metadata: %s", res.StatusCode, errBody)
 	}
@@ -338,8 +339,6 @@ func (r *Registry) PushRegistryTag(remote, revision, tag, registry string, token
 	revision = "\"" + revision + "\""
 	registry = "https://" + registry + "/v1"
 
-	utils.Debugf("Pushing tags for rev [%s] on {%s}\n", revision, registry+"/users/"+remote+"/"+tag)
-
 	req, err := http.NewRequest("PUT", registry+"/repositories/"+remote+"/tags/"+tag, strings.NewReader(revision))
 	if err != nil {
 		return err