containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove more Errorf in favor of Wrapf 

Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #668
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-04-24 17:32:07 -04:00 committed by Atomic Bot
parent 379404d306
commit aa247f950c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/image/pull.go
View File

@ -61,7 +61,7 @@ func (ir *Runtime) getPullStruct(srcRef types.ImageReference, destName string) (
} }
destRef, err := is.Transport.ParseStoreReference(ir.store, reference) destRef, err := is.Transport.ParseStoreReference(ir.store, reference)
if err != nil { if err != nil {
return nil, errors.Errorf("error parsing dest reference name: %v", err) return nil, errors.Wrapf(err, "error parsing dest reference name")
} }
return &pullStruct{ return &pullStruct{
image: destName, image: destName,
@ -85,7 +85,7 @@ func (ir *Runtime) getPullListFromRef(ctx context.Context, srcRef types.ImageRef
manifest, err := tarSource.LoadTarManifest() manifest, err := tarSource.LoadTarManifest()
if err != nil { if err != nil {
return nil, errors.Errorf("error retrieving manifest.json: %v", err) return nil, errors.Wrapf(err, "error retrieving manifest.json")
} }
// to pull the first image stored in the tar file // to pull the first image stored in the tar file
if len(manifest) == 0 { if len(manifest) == 0 {
@ -224,7 +224,7 @@ func (i *Image) createNamesToPull() ([]*pullStruct, error) {
if decomposedImage.hasRegistry { if decomposedImage.hasRegistry {
srcRef, err := alltransports.ParseImageName(decomposedImage.assembleWithTransport()) srcRef, err := alltransports.ParseImageName(decomposedImage.assembleWithTransport())
if err != nil { if err != nil {
return nil, errors.Errorf("unable to parse '%s'", i.InputName) return nil, errors.Wrapf(err, "unable to parse '%s'", i.InputName)
} }
ps := pullStruct{ ps := pullStruct{
image: i.InputName, image: i.InputName,
@ -246,7 +246,7 @@ func (i *Image) createNamesToPull() ([]*pullStruct, error) {
decomposedImage.registry = registry decomposedImage.registry = registry
srcRef, err := alltransports.ParseImageName(decomposedImage.assembleWithTransport()) srcRef, err := alltransports.ParseImageName(decomposedImage.assembleWithTransport())
if err != nil { if err != nil {
return nil, errors.Errorf("unable to parse '%s'", i.InputName) return nil, errors.Wrapf(err, "unable to parse '%s'", i.InputName)
} }
ps := pullStruct{ ps := pullStruct{
image: decomposedImage.assemble(), image: decomposedImage.assemble(),
@ -259,7 +259,7 @@ func (i *Image) createNamesToPull() ([]*pullStruct, error) {
for _, pStruct := range pullNames { for _, pStruct := range pullNames {
destRef, err := is.Transport.ParseStoreReference(i.imageruntime.store, pStruct.image) destRef, err := is.Transport.ParseStoreReference(i.imageruntime.store, pStruct.image)
if err != nil { if err != nil {
return nil, errors.Errorf("error parsing dest reference name: %v", err) return nil, errors.Wrapf(err, "error parsing dest reference name")
} }
pStruct.dstRef = destRef pStruct.dstRef = destRef
} }