docker/buildah
1
0
Fork 0
mirror of https://github.com/containers/buildah.git synced 2025-07-30 04:23:09 +03:00
Code Activity

Change functions that use a fmt.Errorf to wrap an err to error.Wrapf

Browse Source 
Impove error reporting by wrapping all returned err functions with
error.Wrapf

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Closes: #124
Approved by: nalind

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Closes: #125
Approved by: nalind
This commit is contained in:
Dan Walsh
2017-06-01 15:23:02 -04:00
committed by Atomic Bot
parent 59dfec35c3
commit 8ced1276e5
26 changed files with 147 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commit.go
View File

@ -1,7 +1,6 @@
package buildah
import (
"fmt"
"io"
"github.com/Sirupsen/logrus"
@ -11,6 +10,7 @@ import (
"github.com/containers/image/transports"
"github.com/containers/image/types"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
"github.com/projectatomic/buildah/util"
)
@ -52,22 +52,22 @@ func (b *Builder) Commit(dest types.ImageReference, options CommitOptions) error
}
src, err := b.makeContainerImageRef(options.PreferredManifestType, options.Compression)
if err != nil {
return fmt.Errorf("error recomputing layer digests and building metadata: %v", err)
return errors.Wrapf(err, "error recomputing layer digests and building metadata")
}
err = copy.Image(policyContext, dest, src, getCopyOptions(options.ReportWriter))
if err != nil {
return fmt.Errorf("error copying layers and metadata: %v", err)
return errors.Wrapf(err, "error copying layers and metadata")
}
if len(options.AdditionalTags) > 0 {
switch dest.Transport().Name() {
case storage.Transport.Name():
img, err := storage.Transport.GetStoreImage(b.store, dest)
if err != nil {
return fmt.Errorf("error locating just-written image %q: %v", transports.ImageName(dest), err)
return errors.Wrapf(err, "error locating just-written image %q", transports.ImageName(dest))
}
err = util.AddImageNames(b.store, img, options.AdditionalTags)
if err != nil {
return fmt.Errorf("error setting image names to %v: %v", append(img.Names, options.AdditionalTags...), err)
return errors.Wrapf(err, "error setting image names to %v", append(img.Names, options.AdditionalTags...))
}
default:
logrus.Warnf("don't know how to add tags to images stored in %q transport", dest.Transport().Name())