diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-30 19:52:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 19:52:17 +0100 |
| commit | 1fe79dd677c75af3915418d96f12b6f4a75ee568 (patch) | |
| tree | 7eac63217e5cb71d03cab39120e8b1fc417134e1 /pkg/domain/infra/abi/cp.go | |
| parent | 3653e57a2a589bebfdde99fb3c0334d04f350888 (diff) | |
| parent | 831d7fb0d7ee007fc04b1b0ff24b77c7d5635f5e (diff) | |
| download | podman-1fe79dd677c75af3915418d96f12b6f4a75ee568.tar.gz podman-1fe79dd677c75af3915418d96f12b6f4a75ee568.tar.bz2 podman-1fe79dd677c75af3915418d96f12b6f4a75ee568.zip | |
Merge pull request #8177 from rhatdan/wrap
Stop excessive wrapping of errors
Diffstat (limited to 'pkg/domain/infra/abi/cp.go')
| -rw-r--r-- | pkg/domain/infra/abi/cp.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/cp.go b/pkg/domain/infra/abi/cp.go index ab90c8183..8f4f5d3d7 100644 --- a/pkg/domain/infra/abi/cp.go +++ b/pkg/domain/infra/abi/cp.go @@ -214,7 +214,7 @@ func getPathInfo(path string) (string, os.FileInfo, error) { } srcfi, err := os.Stat(path) if err != nil { - return "", nil, errors.Wrapf(err, "error reading path %q", path) + return "", nil, err } return path, srcfi, nil } @@ -245,7 +245,7 @@ func containerCopy(srcPath, destPath, src, dest string, idMappingOpts storage.ID } _, err = os.Stat(destdir) if err != nil && !os.IsNotExist(err) { - return errors.Wrapf(err, "error checking directory %q", destdir) + return err } destDirIsExist := err == nil if err = os.MkdirAll(destdir, 0755); err != nil { @@ -292,7 +292,7 @@ func containerCopy(srcPath, destPath, src, dest string, idMappingOpts storage.ID destfi, err := os.Stat(destPath) if err != nil { if !os.IsNotExist(err) || strings.HasSuffix(dest, string(os.PathSeparator)) { - return errors.Wrapf(err, "failed to get stat of dest path %s", destPath) + return err } } if destfi != nil && destfi.IsDir() { |