diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-31 20:34:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 20:34:36 +0200 |
| commit | 56ab9e4cc8a33bb8a791a799753a11c33809dedf (patch) | |
| tree | 1f0f7e2de1c9cfe41c3e49203772ea9d76df144a /pkg/varlinkapi/attach.go | |
| parent | 4e3010d4e761fcb3d6de3b38cac1dc5b4371b129 (diff) | |
| parent | 7a12e01556773f0690b1e125f59dc0f4d38fdfcc (diff) | |
| download | podman-56ab9e4cc8a33bb8a791a799753a11c33809dedf.tar.gz podman-56ab9e4cc8a33bb8a791a799753a11c33809dedf.tar.bz2 podman-56ab9e4cc8a33bb8a791a799753a11c33809dedf.zip | |
Merge pull request #5649 from jwhonce/wip/varlink
V2 Move varlink home
Diffstat (limited to 'pkg/varlinkapi/attach.go')
| -rw-r--r-- | pkg/varlinkapi/attach.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index 5beca3c6f..94f4d653e 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -6,10 +6,10 @@ import ( "bufio" "io" - "github.com/containers/libpod/cmd/podman/varlink" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/events" + iopodman "github.com/containers/libpod/pkg/varlink" "github.com/containers/libpod/pkg/varlinkapi/virtwriter" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -28,7 +28,7 @@ func setupStreams(call iopodman.VarlinkCall) (*bufio.Reader, *bufio.Writer, *io. stdoutWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.ToStdout) // TODO if runc ever starts passing stderr, we can too - //stderrWriter := NewVirtWriteCloser(writer, ToStderr) + // stderrWriter := NewVirtWriteCloser(writer, ToStderr) streams := libpod.AttachStreams{ OutputStream: stdoutWriter, |