norohind/dive-zfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dead code lint

Browse Source
This commit is contained in:
Alex Goodman 2019-10-08 10:14:46 -04:00
parent 41b42cdd68
commit 3e490f7b5c
No known key found for this signature in database
GPG Key ID: 98AF011C5C78EB7E
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dive/image/podman/resolver_linux.go
View File

@ -40,39 +40,39 @@ func (r *resolver) Fetch(id string) (*image.Image, error) {
return nil, fmt.Errorf("unable to resolve image '%s'", id)
}
func (r *resolver) resolveFromDisk(id string) (*image.Image, error) {
var img *ImageDirectoryRef
var err error
runtime, err := libpod.NewRuntime(context.TODO())
if err != nil {
return nil, err
}
images, err := runtime.ImageRuntime().GetImages()
if err != nil {
return nil, err
}
ImageLoop:
for _, candidateImage := range images {
for _, name := range candidateImage.Names() {
if name == id {
img, err = NewImageDirectoryRef(candidateImage)
if err != nil {
return nil, err
}
break ImageLoop
}
}
}
if img == nil {
return nil, fmt.Errorf("could not find image by name: '%s'", id)
}
return img.ToImage()
}
// func (r *resolver) resolveFromDisk(id string) (*image.Image, error) {
// var img *ImageDirectoryRef
// var err error
//
// runtime, err := libpod.NewRuntime(context.TODO())
// if err != nil {
// return nil, err
// }
//
// images, err := runtime.ImageRuntime().GetImages()
// if err != nil {
// return nil, err
// }
//
// ImageLoop:
// for _, candidateImage := range images {
// for _, name := range candidateImage.Names() {
// if name == id {
// img, err = NewImageDirectoryRef(candidateImage)
// if err != nil {
// return nil, err
// }
// break ImageLoop
// }
// }
// }
//
// if img == nil {
// return nil, fmt.Errorf("could not find image by name: '%s'", id)
// }
//
// return img.ToImage()
// }
func (r *resolver) resolveFromDockerArchive(id string) (*image.Image, error) {
path, err := r.fetchDockerArchive(id)