daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

registry/storage: ignore missing tag on delete 

Signed-off-by: Stephen J Day <stephen.day@docker.com>
master
Stephen J Day 2018-02-06 15:25:51 -08:00
parent fea8bd5114
commit 1ba5b3b553
No known key found for this signature in database
GPG Key ID: 67B3DED84EDC823F
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
registry/storage/tagstore.go
View File

@ -122,17 +122,20 @@ func (ts *tagStore) Untag(ctx context.Context, tag string) error {
name: ts.repository.Named().Name(), name: ts.repository.Named().Name(),
tag: tag, tag: tag,
}) })
if err != nil {
switch err.(type) {
case storagedriver.PathNotFoundError:
return distribution.ErrTagUnknown{Tag: tag}
case nil:
break
default:
return err return err
} }
return ts.blobStore.driver.Delete(ctx, tagPath) if err := ts.blobStore.driver.Delete(ctx, tagPath); err != nil {
switch err.(type) {
case storagedriver.PathNotFoundError:
return nil // Untag is idempotent, we don't care if it didn't exist
default:
return err
}
}
return nil
} }
// linkedBlobStore returns the linkedBlobStore for the named tag, allowing one // linkedBlobStore returns the linkedBlobStore for the named tag, allowing one