Skip to content

Commit d89c14b

Browse files
saschagrunertsaschagrunert
committed
Switch to updated version of creack/pty
Looks like there is a regression which does not allow to run exec any more when compiling CRI-O with newer go versions. Fixes #4110 Signed-off-by: Sascha Grunert <[email protected]>
1 parent 75b5183 commit d89c14b

File tree

15 files changed

+51
-153
lines changed

15 files changed

+51
-153
lines changed

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
2424
github.com/coreos/go-systemd/v22 v22.0.0
2525
github.com/cpuguy83/go-md2man v1.0.10
26-
github.com/creack/pty v1.1.9 // indirect
26+
github.com/creack/pty v1.1.11
2727
github.com/cri-o/ocicni v0.2.1-0.20200422173648-513ef787b8c9
2828
github.com/docker/docker v1.4.2-0.20191219165747-a9416c67da9f
2929
github.com/docker/go-units v0.4.0
@@ -41,7 +41,6 @@ require (
4141
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
4242
github.com/hpcloud/tail v1.0.0
4343
github.com/klauspost/cpuid v1.2.1 // indirect
44-
github.com/kr/pty v1.1.8
4544
github.com/onsi/ginkgo v1.12.0
4645
github.com/onsi/gomega v1.9.0
4746
github.com/opencontainers/go-digest v1.0.0-rc1

‎go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
188188
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
189189
github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
190190
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
191+
github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
192+
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
191193
github.com/cri-o/ocicni v0.1.1-0.20190920040751-deac903fd99b/go.mod h1:ZOuIEOp/3MB1eCBWANnNxM3zUA3NWh76wSRCsnKAg2c=
192194
github.com/cri-o/ocicni v0.2.1-0.20200422173648-513ef787b8c9 h1:dAbtJnDldXrdkhcumFHVaA/XBDJkWrI8Z3enj/DW07Q=
193195
github.com/cri-o/ocicni v0.2.1-0.20200422173648-513ef787b8c9/go.mod h1:839vrWpNBb3HiYh5seMM7H1vTB1iVn23B0jvoa7IFOk=
@@ -499,6 +501,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
499501
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
500502
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
501503
github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
504+
github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
502505
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
503506
github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
504507
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=

‎internal/oci/oci_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"time"
1010

1111
"github.com/containers/libpod/pkg/cgroups"
12+
"github.com/creack/pty"
1213
"github.com/docker/docker/pkg/pools"
1314
"github.com/docker/docker/pkg/term"
14-
"github.com/kr/pty"
1515
"github.com/sirupsen/logrus"
1616
"golang.org/x/sys/unix"
1717
"k8s.io/client-go/tools/remotecommand"

‎vendor/github.com/creack/pty/run.go‎

Lines changed: 29 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/creack/pty/test_crosscompile.sh‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/creack/pty/ztypes_freebsd_arm64.go‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/creack/pty/ztypes_openbsd_386.go renamed to vendor/github.com/creack/pty/ztypes_openbsd_32bit_int.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/creack/pty/ztypes_openbsd_amd64.go‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎vendor/github.com/kr/pty/.gitignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎vendor/github.com/kr/pty/LICENSE‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)