diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-10 07:52:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 07:52:46 -0400 |
| commit | efc1936c7c591cb3b552246ff4687c8631456168 (patch) | |
| tree | 057d0f294bf22414526a033b48af2fa41edb93a2 /pkg/domain/infra/tunnel/containers.go | |
| parent | 9f1bd0a0a1494f46a49ca7f22511c5a78006afd8 (diff) | |
| parent | d4272bed51e2060d431ad042e803770e4d2fe64e (diff) | |
| download | podman-efc1936c7c591cb3b552246ff4687c8631456168.tar.gz podman-efc1936c7c591cb3b552246ff4687c8631456168.tar.bz2 podman-efc1936c7c591cb3b552246ff4687c8631456168.zip | |
Merge pull request #14526 from vrothberg/fix-14420
podman cp: do not overwrite non-dirs with dirs and vice versa
Diffstat (limited to 'pkg/domain/infra/tunnel/containers.go')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 82e8fbb5b..b68bc46d4 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -949,7 +949,7 @@ func (ic *ContainerEngine) ContainerPort(ctx context.Context, nameOrID string, o } func (ic *ContainerEngine) ContainerCopyFromArchive(ctx context.Context, nameOrID, path string, reader io.Reader, options entities.CopyOptions) (entities.ContainerCopyFunc, error) { - copyOptions := new(containers.CopyOptions).WithChown(options.Chown).WithRename(options.Rename) + copyOptions := new(containers.CopyOptions).WithChown(options.Chown).WithRename(options.Rename).WithNoOverwriteDirNonDir(options.NoOverwriteDirNonDir) return containers.CopyFromArchiveWithOptions(ic.ClientCtx, nameOrID, path, reader, copyOptions) } |