From aa502874c4c1f788ee96d47e7d9bfc8bf2b03483 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 15 Jan 2016 10:56:10 -0800 Subject: [PATCH] godeps: update github.com/kr/pty Signed-off-by: Mike Danese --- Godeps/Godeps.json | 6 +++--- Godeps/_workspace/src/github.com/kr/pty/run.go | 6 +++++- .../_workspace/src/github.com/kr/pty/ztypes_arm64.go | 11 +++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index a43a081e630..756ff1e22df 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kubernetes", - "GoVersion": "go1.5.1", + "GoVersion": "go1.5", "Packages": [ "./..." ], @@ -692,8 +692,8 @@ }, { "ImportPath": "github.com/kr/pty", - "Comment": "release.r56-25-g05017fc", - "Rev": "05017fcccf23c823bfdea560dcc958a136e54fb7" + "Comment": "release.r56-29-gf7ee69f", + "Rev": "f7ee69f31298ecbe5d2b349c711e2547a617d398" }, { "ImportPath": "github.com/matttproud/golang_protobuf_extensions/pbutil", diff --git a/Godeps/_workspace/src/github.com/kr/pty/run.go b/Godeps/_workspace/src/github.com/kr/pty/run.go index f0678d2a27e..c2bc48878c9 100644 --- a/Godeps/_workspace/src/github.com/kr/pty/run.go +++ b/Godeps/_workspace/src/github.com/kr/pty/run.go @@ -18,7 +18,11 @@ func Start(c *exec.Cmd) (pty *os.File, err error) { c.Stdout = tty c.Stdin = tty c.Stderr = tty - c.SysProcAttr = &syscall.SysProcAttr{Setctty: true, Setsid: true} + if c.SysProcAttr == nil { + c.SysProcAttr = &syscall.SysProcAttr{} + } + c.SysProcAttr.Setctty = true + c.SysProcAttr.Setsid = true err = c.Start() if err != nil { pty.Close() diff --git a/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go b/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go new file mode 100644 index 00000000000..6c29a4b9188 --- /dev/null +++ b/Godeps/_workspace/src/github.com/kr/pty/ztypes_arm64.go @@ -0,0 +1,11 @@ +// Created by cgo -godefs - DO NOT EDIT +// cgo -godefs types.go + +// +build arm64 + +package pty + +type ( + _C_int int32 + _C_uint uint32 +)