From c826329d66ae1abe82e419e85034d107cc73ef69 Mon Sep 17 00:00:00 2001
From: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Date: Tue, 5 Jan 2016 23:22:51 -0800
Subject: [PATCH] improve message for ErrMetaNotFound

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
---
 tuf/client/client.go     | 2 +-
 tuf/store/errors.go      | 4 ++--
 tuf/store/filestore.go   | 2 +-
 tuf/store/memorystore.go | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tuf/client/client.go b/tuf/client/client.go
index bc60b8dc77..be28aed122 100644
--- a/tuf/client/client.go
+++ b/tuf/client/client.go
@@ -272,7 +272,7 @@ func (c *Client) downloadTimestamp() error {
 			if err == nil {
 				// couldn't retrieve data from server and don't have valid
 				// data in cache.
-				return store.ErrMetaNotFound{}
+				return store.ErrMetaNotFound{Resource: data.CanonicalTimestampRole}
 			}
 			return err
 		}
diff --git a/tuf/store/errors.go b/tuf/store/errors.go
index 902edf8c08..a7f63d6bbd 100644
--- a/tuf/store/errors.go
+++ b/tuf/store/errors.go
@@ -5,9 +5,9 @@ import "fmt"
 // ErrMetaNotFound indicates we did not find a particular piece
 // of metadata in the store
 type ErrMetaNotFound struct {
-	Role string
+	Resource string
 }
 
 func (err ErrMetaNotFound) Error() string {
-	return fmt.Sprintf("%s trust data unavailable", err.Role)
+	return fmt.Sprintf("%s trust data unavailable.  Has a notary repository been initialized?", err.Resource)
 }
diff --git a/tuf/store/filestore.go b/tuf/store/filestore.go
index 7e7ea02f8c..6ce39ed3ec 100644
--- a/tuf/store/filestore.go
+++ b/tuf/store/filestore.go
@@ -46,7 +46,7 @@ func (f *FilesystemStore) GetMeta(name string, size int64) ([]byte, error) {
 	meta, err := ioutil.ReadFile(path)
 	if err != nil {
 		if os.IsNotExist(err) {
-			err = ErrMetaNotFound{Role: name}
+			err = ErrMetaNotFound{Resource: name}
 		}
 		return nil, err
 	}
diff --git a/tuf/store/memorystore.go b/tuf/store/memorystore.go
index 0e17889891..5d3e44beb3 100644
--- a/tuf/store/memorystore.go
+++ b/tuf/store/memorystore.go
@@ -39,7 +39,7 @@ func (m *memoryStore) GetMeta(name string, size int64) ([]byte, error) {
 		}
 		return d[:size], nil
 	}
-	return nil, ErrMetaNotFound{}
+	return nil, ErrMetaNotFound{Resource: name}
 }
 
 func (m *memoryStore) SetMeta(name string, meta []byte) error {
@@ -75,7 +75,7 @@ func (m *memoryStore) WalkStagedTargets(paths []string, targetsFn targetsWalkFun
 	for _, path := range paths {
 		dat, ok := m.files[path]
 		if !ok {
-			return ErrMetaNotFound{}
+			return ErrMetaNotFound{Resource: path}
 		}
 		meta, err := data.NewFileMeta(bytes.NewReader(dat), "sha256")
 		if err != nil {