kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete 

image_delete: move name check first
This commit is contained in:
Antonio Murdaca 2015-08-06 02:07:34 +02:00
parent 8534090476 cb2def9f90
commit 044c4e00a0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/image_delete.go
View File

@ -27,6 +27,10 @@ func (daemon *Daemon) ImageDelete(name string, force, noprune bool) ([]types.Ima
} }
func (daemon *Daemon) imgDeleteHelper(name string, list *[]types.ImageDelete, first, force, noprune bool) error { func (daemon *Daemon) imgDeleteHelper(name string, list *[]types.ImageDelete, first, force, noprune bool) error {
if name == "" {
return fmt.Errorf("Image name can not be blank")
}
var repoName, tag string var repoName, tag string
repoAndTags := make(map[string][]string) repoAndTags := make(map[string][]string)
@ -36,10 +40,6 @@ func (daemon *Daemon) imgDeleteHelper(name string, list *[]types.ImageDelete, fi
tag = tags.DefaultTag tag = tags.DefaultTag
} }
if name == "" {
return fmt.Errorf("Image name can not be blank")
}
img, err := daemon.Repositories().LookupImage(name) img, err := daemon.Repositories().LookupImage(name)
if err != nil { if err != nil {
if r, _ := daemon.Repositories().Get(repoName); r != nil { if r, _ := daemon.Repositories().Get(repoName); r != nil {
@ -54,7 +54,6 @@ func (daemon *Daemon) imgDeleteHelper(name string, list *[]types.ImageDelete, fi
} }
byParents := daemon.Graph().ByParent() byParents := daemon.Graph().ByParent()
repos := daemon.Repositories().ByID()[img.ID] repos := daemon.Repositories().ByID()[img.ID]
//If delete by id, see if the id belong only to one repository //If delete by id, see if the id belong only to one repository