diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-01 09:14:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 09:14:53 -0400 |
| commit | de460bf97891055fe34bf1540a5f29b45b6771a8 (patch) | |
| tree | fa01c95055b0c110c5a2628d12c1d67f3dc882e7 /utils | |
| parent | af2a1327d18f8f0eb50ad9b0f99a64f917ab730e (diff) | |
| parent | e3ced7217f8c60de7faf1ad7d741709d8a255e95 (diff) | |
| download | podman-de460bf97891055fe34bf1540a5f29b45b6771a8.tar.gz podman-de460bf97891055fe34bf1540a5f29b45b6771a8.tar.bz2 podman-de460bf97891055fe34bf1540a5f29b45b6771a8.zip | |
Merge pull request #7177 from mheon/there_can_be_only_one
Ensure libpod/define does not include libpod/image
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/utils.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/utils.go b/utils/utils.go index 27ce1821d..a6ef663d7 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -9,6 +9,7 @@ import ( "strconv" "strings" + "github.com/containers/podman/v2/libpod/define" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -51,7 +52,7 @@ func ExecCmdWithStdStreams(stdin io.Reader, stdout, stderr io.Writer, env []stri // ErrDetach is an error indicating that the user manually detached from the // container. -var ErrDetach = errors.New("detached from container") +var ErrDetach = define.ErrDetach // CopyDetachable is similar to io.Copy but support a detach key sequence to break out. func CopyDetachable(dst io.Writer, src io.Reader, keys []byte) (written int64, err error) { |