From 98703eb204923f06555605c648fc165a55214520 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 8 Jul 2018 07:55:30 -0400 Subject: Vendor in latest code for storage,image, buildah vendor in containers/storage vendor in containers/image vendor in projectatomic/buildah Signed-off-by: Daniel J Walsh Closes: #1114 Approved by: mheon --- vendor/github.com/projectatomic/buildah/imagebuildah/build.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vendor/github.com/projectatomic/buildah/imagebuildah') diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go index e7fad7f67..672d6e94d 100644 --- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go +++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go @@ -709,18 +709,19 @@ func (b *Executor) resolveNameToImageRef() (types.ImageReference, error) { if err != nil { candidates := util.ResolveName(b.output, "", b.systemContext, b.store) if len(candidates) == 0 { - return imageRef, errors.Errorf("error parsing target image name %q", b.output) + return nil, errors.Errorf("error parsing target image name %q", b.output) } imageRef2, err2 := is.Transport.ParseStoreReference(b.store, candidates[0]) if err2 != nil { - return imageRef, errors.Wrapf(err, "error parsing target image name %q", b.output) + return nil, errors.Wrapf(err, "error parsing target image name %q", b.output) } return imageRef2, nil } + return imageRef, nil } imageRef, err = is.Transport.ParseStoreReference(b.store, "@"+stringid.GenerateRandomID()) if err != nil { - return imageRef, errors.Wrapf(err, "error parsing reference for image to be written") + return nil, errors.Wrapf(err, "error parsing reference for image to be written") } return imageRef, nil } -- cgit v1.2.3-54-g00ecf