diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-06 10:15:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 10:15:04 +0200 |
| commit | 80a2317ca20b0e5e1cd064a8962beed642be3a36 (patch) | |
| tree | 0730915a611542bf028d5b9c66ace1390a6c036f /pkg/domain/infra/abi/cp.go | |
| parent | f584d47a9d0c050c3b39793a73b0aba17b45e8ba (diff) | |
| parent | d4aa89bb40b3a2c1730c9bff31a681007a3feb97 (diff) | |
| download | podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.tar.gz podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.tar.bz2 podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.zip | |
Merge pull request #7929 from kolyshkin/nits-err
Nits
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 0cd2ac8ca..a0bfcc90c 100644 --- a/pkg/domain/infra/abi/cp.go +++ b/pkg/domain/infra/abi/cp.go @@ -115,7 +115,7 @@ func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string, return nil, err } if err = idtools.MkdirAllAndChownNew(ctrWorkDir, 0755, hostOwner); err != nil { - return nil, errors.Wrapf(err, "error creating directory %q", destPath) + return nil, err } cleanedPath, err := securejoin.SecureJoin(mountPoint, filepath.Join(ctr.WorkingDir(), destPath)) if err != nil { @@ -249,7 +249,7 @@ func containerCopy(srcPath, destPath, src, dest string, idMappingOpts storage.ID } destDirIsExist := err == nil if err = os.MkdirAll(destdir, 0755); err != nil { - return errors.Wrapf(err, "error creating directory %q", destdir) + return err } // return functions for copying items @@ -351,7 +351,7 @@ func streamFileToStdout(srcPath string, srcfi os.FileInfo) error { file, err := os.Open(srcPath) if err != nil { - return errors.Wrapf(err, "error opening file %s", srcPath) + return err } defer file.Close() if !archive.IsArchivePath(srcPath) { |