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

fixing download to continue if we get ErrMetaNotFound 

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2015-12-17 15:53:57 -08:00
parent f72f799806
commit 594049b24f
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/client.go
View File

@ -491,21 +491,13 @@ func (r *NotaryRepository) GetTargetByName(name string, roles ...string) (*Targe
meta *data.FileMeta
)
for i := len(roles) - 1; i >= 0; i-- {
meta, err = c.TargetMeta(roles[i], name, roles...)
if err != nil {
// important to error here otherwise there might be malicious
// behaviour that prevents a legitimate version of a target
// being found
return nil, err
} else if meta != nil {
break
meta = c.TargetMeta(roles[i], name, roles...)
if meta != nil {
return &Target{Name: name, Hashes: meta.Hashes, Length: meta.Length}, nil
}
}
if meta == nil {
return nil, fmt.Errorf("No trust data for %s", name)
}
return nil, fmt.Errorf("No trust data for %s", name)
return &Target{Name: name, Hashes: meta.Hashes, Length: meta.Length}, nil
}
// GetChangelist returns the list of the repository's unpublished changes

19
tuf/client/client.go
View File

@ -393,6 +393,11 @@ func (c *Client) downloadTargets(role string) error {
keyIDs := r.KeyIDs
s, err := c.getTargetsFile(role, keyIDs, snap.Meta, root.ConsistentSnapshot, r.Threshold)
if err != nil {
if _, ok := err.(store.ErrMetaNotFound); ok {
// if the role meta hasn't been published,
// that's ok, continue
continue
}
logrus.Error("Error getting targets file:", err)
return err
}
@ -520,10 +525,7 @@ func (c Client) RoleTargetsPath(role string, hashSha256 string, consistent bool)
// TargetMeta ensures the repo is up to date. It assumes downloadTargets
// has already downloaded all delegated roles
func (c Client) TargetMeta(role, path string, excludeRoles ...string) (*data.FileMeta, error) {
c.Update()
var meta *data.FileMeta
func (c Client) TargetMeta(role, path string, excludeRoles ...string) *data.FileMeta {
excl := make(map[string]bool)
for _, r := range excludeRoles {
excl[r] = true
@ -534,7 +536,10 @@ func (c Client) TargetMeta(role, path string, excludeRoles ...string) (*data.Fil
// FIFO list of targets delegations to inspect for target
roles := []string{role}
var curr string
var (
meta *data.FileMeta
curr string
)
for len(roles) > 0 {
// have to do these lines here because of order of execution in for statement
curr = roles[0]
@ -543,7 +548,7 @@ func (c Client) TargetMeta(role, path string, excludeRoles ...string) (*data.Fil
meta = c.local.TargetMeta(curr, path)
if meta != nil {
// we found the target!
return meta, nil
return meta
}
delegations := c.local.TargetDelegations(role, path, pathHex)
for _, d := range delegations {
@ -552,7 +557,7 @@ func (c Client) TargetMeta(role, path string, excludeRoles ...string) (*data.Fil
}
}
}
return meta, nil
return meta
}
// DownloadTarget downloads the target to dst from the remote