docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #419 from docker/errmeta-message 

improve message for ErrMetaNotFound
This commit is contained in:
David Lawrence 2016-01-07 16:47:01 -08:00
parent 7992a7da3d c826329d66
commit cf57eaa511
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tuf/client/client.go
View File

@ -272,7 +272,7 @@ func (c *Client) downloadTimestamp() error {
if err == nil { if err == nil {
// couldn't retrieve data from server and don't have valid // couldn't retrieve data from server and don't have valid
// data in cache. // data in cache.
return store.ErrMetaNotFound{} return store.ErrMetaNotFound{Resource: data.CanonicalTimestampRole}
} }
return err return err
} }

4
tuf/store/errors.go
View File

@ -5,9 +5,9 @@ import "fmt"
// ErrMetaNotFound indicates we did not find a particular piece // ErrMetaNotFound indicates we did not find a particular piece
// of metadata in the store // of metadata in the store
type ErrMetaNotFound struct { type ErrMetaNotFound struct {
Role string Resource string
} }
func (err ErrMetaNotFound) Error() 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)
} }

2
tuf/store/filestore.go
View File

@ -46,7 +46,7 @@ func (f *FilesystemStore) GetMeta(name string, size int64) ([]byte, error) {
meta, err := ioutil.ReadFile(path) meta, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
err = ErrMetaNotFound{Role: name} err = ErrMetaNotFound{Resource: name}
} }
return nil, err return nil, err
} }

4
tuf/store/memorystore.go
View File

@ -39,7 +39,7 @@ func (m *memoryStore) GetMeta(name string, size int64) ([]byte, error) {
} }
return d[:size], nil return d[:size], nil
} }
return nil, ErrMetaNotFound{} return nil, ErrMetaNotFound{Resource: name}
} }
func (m *memoryStore) SetMeta(name string, meta []byte) error { 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 { for _, path := range paths {
dat, ok := m.files[path] dat, ok := m.files[path]
if !ok { if !ok {
return ErrMetaNotFound{} return ErrMetaNotFound{Resource: path}
} }
meta, err := data.NewFileMeta(bytes.NewReader(dat), "sha256") meta, err := data.NewFileMeta(bytes.NewReader(dat), "sha256")
if err != nil { if err != nil {