From 82dd963e08778f8c563e058f1b19ccc358965615 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume@dotcloud.com>
Date: Mon, 3 Jun 2013 12:20:52 -0700
Subject: [PATCH] Minor changes in registry.go

---
 registry/registry.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/registry/registry.go b/registry/registry.go
index d9f53ee9f9..8283bf4437 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -64,10 +64,11 @@ func (r *Registry) LookupRemoteImage(imgId, registry string, authConfig *auth.Au
 	}
 	req.SetBasicAuth(authConfig.Username, authConfig.Password)
 	res, err := rt.RoundTrip(req)
-	if err == nil {
-		defer res.Body.Close()
+	if err != nil {
+		return false
 	}
-	return err == nil && res.StatusCode == 307
+	res.Body.Close()
+	return res.StatusCode == 307
 }
 
 func (r *Registry) getImagesInRepository(repository string, authConfig *auth.AuthConfig) ([]map[string]string, error) {
@@ -155,18 +156,19 @@ func (r *Registry) GetRemoteTags(registries []string, repository string, token [
 		}
 		req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))
 		res, err := r.client.Do(req)
-		if err == nil {
-			defer res.Body.Close()
-		}
 		utils.Debugf("Got status code %d from %s", res.StatusCode, endpoint)
-		if err != nil || (res.StatusCode != 200 && res.StatusCode != 404) {
+		if err != nil {
+			return nil, err
+		}
+		defer res.Body.Close()
+
+		if res.StatusCode != 200 && res.StatusCode != 404 {
 			continue
 		} else if res.StatusCode == 404 {
 			return nil, fmt.Errorf("Repository not found")
 		}
 
 		result := make(map[string]string)
-
 		rawJson, err := ioutil.ReadAll(res.Body)
 		if err != nil {
 			return nil, err