From ca98434a45a1c836aa69d67d8cc12b8e95e5722f Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosby.michael@gmail.com>
Date: Fri, 29 Nov 2013 11:06:35 -0800
Subject: [PATCH] Search for repo first before image id

---
 tags.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tags.go b/tags.go
index 21c13bdfb2..92c32b1ff5 100644
--- a/tags.go
+++ b/tags.go
@@ -66,20 +66,18 @@ func (store *TagStore) Reload() error {
 }
 
 func (store *TagStore) LookupImage(name string) (*Image, error) {
-	img, err := store.graph.Get(name)
+	// FIXME: standardize on returning nil when the image doesn't exist, and err for everything else
+	// (so we can pass all errors here)
+	repos, tag := utils.ParseRepositoryTag(name)
+	if tag == "" {
+		tag = DEFAULTTAG
+	}
+	img, err := store.GetImage(repos, tag)
 	if err != nil {
-		// FIXME: standardize on returning nil when the image doesn't exist, and err for everything else
-		// (so we can pass all errors here)
-		repos, tag := utils.ParseRepositoryTag(name)
-		if tag == "" {
-			tag = DEFAULTTAG
-		}
-		if i, err := store.GetImage(repos, tag); err != nil {
+		return nil, err
+	} else if img == nil {
+		if img, err = store.graph.Get(name); err != nil {
 			return nil, err
-		} else if i == nil {
-			return nil, fmt.Errorf("Image does not exist: %s", name)
-		} else {
-			img = i
 		}
 	}
 	return img, nil