diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-27 10:43:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-27 10:43:36 -0400 |
| commit | f48bf5808b2d8da423a6d6e53f8e6699ef233d7c (patch) | |
| tree | 1c39f1664744a01c0d6359e49495c7a11f8ec57d /pkg/domain/infra | |
| parent | a72b2402c9569028abbff2364f4f40f4728e5688 (diff) | |
| parent | 8efdbf5c4c95ece4237aa8ca75f8b0876e65113f (diff) | |
| download | podman-f48bf5808b2d8da423a6d6e53f8e6699ef233d7c.tar.gz podman-f48bf5808b2d8da423a6d6e53f8e6699ef233d7c.tar.bz2 podman-f48bf5808b2d8da423a6d6e53f8e6699ef233d7c.zip | |
Merge pull request #14393 from jwhonce/wip/archive_todo
Add API support for NoOverwriteDirNonDir
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/archive.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/archive.go b/pkg/domain/infra/abi/archive.go index 01e3c7dd1..de96cf8b0 100644 --- a/pkg/domain/infra/abi/archive.go +++ b/pkg/domain/infra/abi/archive.go @@ -12,10 +12,10 @@ func (ic *ContainerEngine) ContainerCopyFromArchive(ctx context.Context, nameOrI if err != nil { return nil, err } - return container.CopyFromArchive(ctx, containerPath, options.Chown, options.Rename, reader) + return container.CopyFromArchive(ctx, containerPath, options.Chown, options.NoOverwriteDirNonDir, options.Rename, reader) } -func (ic *ContainerEngine) ContainerCopyToArchive(ctx context.Context, nameOrID string, containerPath string, writer io.Writer) (entities.ContainerCopyFunc, error) { +func (ic *ContainerEngine) ContainerCopyToArchive(ctx context.Context, nameOrID, containerPath string, writer io.Writer) (entities.ContainerCopyFunc, error) { container, err := ic.Libpod.LookupContainer(nameOrID) if err != nil { return nil, err |