Merge pull request #296 from ijc/support-schema1-manifest

Swallow a NotFound error when deleting content, to support schema 1 m…
docker-18.09
Tõnis Tiigi 2018-02-26 11:31:58 -08:00 committed by GitHub
commit cd6e788437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -258,7 +258,7 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
} }
for _, nl := range notLayerBlobs { for _, nl := range notLayerBlobs {
if err := p.is.ContentStore.Delete(ctx, nl.Digest); err != nil { if err := p.is.ContentStore.Delete(ctx, nl.Digest); err != nil && !errdefs.IsNotFound(err) {
return nil, err return nil, err
} }
} }