diff options
| author | Jhon Honce <jhonce@redhat.com> | 2022-05-26 16:24:10 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2022-05-26 16:31:15 -0700 |
| commit | 8efdbf5c4c95ece4237aa8ca75f8b0876e65113f (patch) | |
| tree | 70bc32e3127943269aade4f683dd75f94b65224c /pkg/domain/infra | |
| parent | 1736f2fe607a82d066497aba330d6a81a07f5164 (diff) | |
| download | podman-8efdbf5c4c95ece4237aa8ca75f8b0876e65113f.tar.gz podman-8efdbf5c4c95ece4237aa8ca75f8b0876e65113f.tar.bz2 podman-8efdbf5c4c95ece4237aa8ca75f8b0876e65113f.zip | |
Add API support for NoOverwriteDirNonDir
Update method signatures and structs to pass option to buildah code
```release-note
NONE
```
[NO NEW TESTS NEEDED]
Signed-off-by: Jhon Honce <jhonce@redhat.com>
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 |