diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-07-31 17:17:56 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-31 17:17:56 -0400 |
| commit | e3ced7217f8c60de7faf1ad7d741709d8a255e95 (patch) | |
| tree | 32fb6c77799aa697c3c47f4e11711b1eaff458e6 /utils | |
| parent | 7a15be546adffe4f884abfbd4ed02f69ac7659e0 (diff) | |
| download | podman-e3ced7217f8c60de7faf1ad7d741709d8a255e95.tar.gz podman-e3ced7217f8c60de7faf1ad7d741709d8a255e95.tar.bz2 podman-e3ced7217f8c60de7faf1ad7d741709d8a255e95.zip | |
Ensure libpod/define does not include libpod/image
The define package under Libpod is intended to be an extremely
minimal package, including constants and very little else.
However, as a result of some legacy code, it was dragging in all
of libpod/image (and, less significantly, the util package).
Fortunately, this was just to ensure that error constants were
not duplicating, and there's nothing preventing us from
importing in the other direction and keeping libpod/define free
of dependencies.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
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) { |