diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2022-02-17 13:46:51 -0500 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-02-22 14:38:57 -0500 |
commit | 80c5962dba7f5ecd6b602aecd0df479bd04391b1 (patch) | |
tree | a1d7fada738182c2eb8cd6993f33625ae704ba94 /vendor/github.com/hashicorp | |
parent | d3903a85910979d8212028cf814574047015db58 (diff) | |
download | podman-80c5962dba7f5ecd6b602aecd0df479bd04391b1.tar.gz podman-80c5962dba7f5ecd6b602aecd0df479bd04391b1.tar.bz2 podman-80c5962dba7f5ecd6b602aecd0df479bd04391b1.zip |
Add containers-common spec and command to podman
Since containers-common package is tied to specific versions
of Podman, add tools to build the package into the contrib directory
This should help other distributions to figure out which commont
package to ship.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/hashicorp')
-rw-r--r-- | vendor/github.com/hashicorp/errwrap/errwrap.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vendor/github.com/hashicorp/errwrap/errwrap.go b/vendor/github.com/hashicorp/errwrap/errwrap.go index a733bef18..44e368e56 100644 --- a/vendor/github.com/hashicorp/errwrap/errwrap.go +++ b/vendor/github.com/hashicorp/errwrap/errwrap.go @@ -44,6 +44,8 @@ func Wrap(outer, inner error) error { // // format is the format of the error message. The string '{{err}}' will // be replaced with the original error message. +// +// Deprecated: Use fmt.Errorf() func Wrapf(format string, err error) error { outerMsg := "<nil>" if err != nil { @@ -148,6 +150,9 @@ func Walk(err error, cb WalkFunc) { for _, err := range e.WrappedErrors() { Walk(err, cb) } + case interface{ Unwrap() error }: + cb(err) + Walk(e.Unwrap(), cb) default: cb(err) } @@ -167,3 +172,7 @@ func (w *wrappedError) Error() string { func (w *wrappedError) WrappedErrors() []error { return []error{w.Outer, w.Inner} } + +func (w *wrappedError) Unwrap() error { + return w.Inner +} |