diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-26 02:36:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 02:36:06 +0200 |
| commit | c9078936dd1bf5bdb59066eb1bdd179ac58f98e1 (patch) | |
| tree | a8d769074e3ba43e100341c974639166c46ca5eb /cmd/podman/cp.go | |
| parent | fbf5e80337c6399aa54c8ea1bc316eddb369ab0b (diff) | |
| parent | dd81a44ccfa34585ef62319835c8bb421db9e334 (diff) | |
| download | podman-c9078936dd1bf5bdb59066eb1bdd179ac58f98e1.tar.gz podman-c9078936dd1bf5bdb59066eb1bdd179ac58f98e1.tar.bz2 podman-c9078936dd1bf5bdb59066eb1bdd179ac58f98e1.zip | |
Merge pull request #3419 from baude/removelibpodfrommainphase1
remove libpod from main
Diffstat (limited to 'cmd/podman/cp.go')
| -rw-r--r-- | cmd/podman/cp.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go index efe343bfd..9d00dbe59 100644 --- a/cmd/podman/cp.go +++ b/cmd/podman/cp.go @@ -13,14 +13,15 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/chrootarchive" "github.com/containers/storage/pkg/idtools" securejoin "github.com/cyphar/filepath-securejoin" - digest "github.com/opencontainers/go-digest" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/go-digest" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -114,7 +115,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin // TODO: We can potentially start the container while // the copy is running, which still allows a race where // malicious code could mess with the symlink. - if errors.Cause(err) != libpod.ErrCtrStateInvalid { + if errors.Cause(err) != define.ErrCtrStateInvalid { return err } } else if err == nil { |