diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-19 03:49:17 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-19 03:49:17 -0700 |
commit | c4a551373004219fd2d50e5b055dbc5e233e4e32 (patch) | |
tree | deeb60c8d13ba55ff32512b29a183748ced677cc /vendor/github.com/Microsoft/hcsshim/computestorage/setup.go | |
parent | 5d9b07096b49877608250c7d51e0ee35b9d502c7 (diff) | |
parent | ec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2 (diff) | |
download | podman-c4a551373004219fd2d50e5b055dbc5e233e4e32.tar.gz podman-c4a551373004219fd2d50e5b055dbc5e233e4e32.tar.bz2 podman-c4a551373004219fd2d50e5b055dbc5e233e4e32.zip |
Merge pull request #9734 from containers/dependabot/go_modules/github.com/containers/storage-1.28.0
Bump github.com/containers/storage from 1.25.0 to 1.28.0
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/computestorage/setup.go')
-rw-r--r-- | vendor/github.com/Microsoft/hcsshim/computestorage/setup.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go b/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go index 13ce0cd60..7506709ca 100644 --- a/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go +++ b/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go @@ -3,11 +3,10 @@ package computestorage import ( "context" "encoding/json" - "errors" - "fmt" "github.com/Microsoft/hcsshim/internal/oc" "github.com/Microsoft/hcsshim/osversion" + "github.com/pkg/errors" "go.opencensus.io/trace" "golang.org/x/sys/windows" ) @@ -37,7 +36,7 @@ func SetupBaseOSLayer(ctx context.Context, layerPath string, vhdHandle windows.H err = hcsSetupBaseOSLayer(layerPath, vhdHandle, string(bytes)) if err != nil { - return fmt.Errorf("failed to setup base OS layer: %s", err) + return errors.Wrap(err, "failed to setup base OS layer") } return nil } @@ -69,7 +68,7 @@ func SetupBaseOSVolume(ctx context.Context, layerPath, volumePath string, option err = hcsSetupBaseOSVolume(layerPath, volumePath, string(bytes)) if err != nil { - return fmt.Errorf("failed to setup base OS layer: %s", err) + return errors.Wrap(err, "failed to setup base OS layer") } return nil } |