Merge pull request #10696 from dmcgowan/remove-nonofficial-trust-check

This commit is contained in:
Steve Francia 2015-02-19 16:09:52 -05:00
commit 47f6001416

View file

@ -73,9 +73,11 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status {
}
if len(repoInfo.Index.Mirrors) == 0 && ((repoInfo.Official && repoInfo.Index.Official) || endpoint.Version == registry.APIVersion2) {
j := job.Eng.Job("trust_update_base")
if err = j.Run(); err != nil {
log.Errorf("error updating trust base graph: %s", err)
if repoInfo.Official {
j := job.Eng.Job("trust_update_base")
if err = j.Run(); err != nil {
log.Errorf("error updating trust base graph: %s", err)
}
}
log.Debugf("pulling v2 repository with local name %q", repoInfo.LocalName)