0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

image_delete: move name check first

Browse source 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Ma Shimiao 2015-08-05 23:46:57 +08:00
parent 6206cbe193
commit cb2def9f90
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 {
if name == "" {
return fmt.Errorf("Image name can not be blank")
}
var repoName, tag string
repoAndTags := make(map[string][]string)
@ -36,10 +40,6 @@ func (daemon *Daemon) imgDeleteHelper(name string, list *[]types.ImageDelete, fi
tag = tags.DefaultTag
}
if name == "" {
return fmt.Errorf("Image name can not be blank")
}
img, err := daemon.Repositories().LookupImage(name)
if err != 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()
repos := daemon.Repositories().ByID()[img.ID]
//If delete by id, see if the id belong only to one repository