From f498dd2a2b5128eca47517923d7e84238db0483c Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume@dotcloud.com>
Date: Thu, 16 May 2013 12:29:16 -0700
Subject: [PATCH] - Registry: Fix issue preventing to pull specific tag

---
 server.go | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/server.go b/server.go
index 2f45802ca6..dafa44ec84 100644
--- a/server.go
+++ b/server.go
@@ -340,13 +340,24 @@ func (srv *Server) pullRepository(stdout io.Writer, remote, askedTag string) err
 	if err != nil {
 		return err
 	}
-	for tag, id := range tagsList {
-		repoData.ImgList[id].Tag = tag
+	utils.Debugf("Registering tags")
+	// If not specific tag have been asked, take all
+	if askedTag == "" {
+		for tag, id := range tagsList {
+			repoData.ImgList[id].Tag = tag
+		}
+	} else {
+		// Otherwise, check that the tag exists and use only that one
+		if id, exists := tagsList[askedTag]; !exists {
+			return fmt.Errorf("Tag %s not found in repositoy %s", askedTag, remote)
+		} else {
+			repoData.ImgList[id].Tag = askedTag
+		}
 	}
 
 	for _, img := range repoData.ImgList {
-		// If we asked for a specific tag, skip all tags expect the wanted one
-		if askedTag != "" && askedTag != img.Tag {
+		if askedTag != "" && img.Tag != askedTag {
+			utils.Debugf("%s does not match %s, skipping", img.Tag, askedTag)
 			continue
 		}
 		fmt.Fprintf(stdout, "Pulling image %s (%s) from %s\n", img.Id, img.Tag, remote)
@@ -367,6 +378,10 @@ func (srv *Server) pullRepository(stdout io.Writer, remote, askedTag string) err
 			return fmt.Errorf("Could not find repository on any of the indexed registries.")
 		}
 	}
+	// If we asked for a specific tag, do not register the others
+	if askedTag != "" {
+		return nil
+	}
 	for tag, id := range tagsList {
 		if err := srv.runtime.repositories.Set(remote, tag, id, true); err != nil {
 			return err