Commitcc92ef0

committed

Remove errBuf, prints errors about pseudo terminal

1 parenta41749e commitcc92ef0Copy full SHA for cc92ef0

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,23 +140,19 @@ func praseIdentityFilesForHost(ctx context.Context, args, env []string) (identit`
`140`	`140`	`returnnil,xerrors.Errorf("get user home dir failed: %w",err)`
`141`	`141`	`}`
`142`	`142`
`143`		`-varoutBuf,errBuf bytes.Buffer`
	`143`	`+varoutBuf bytes.Buffer`
`144`	`144`	`varr io.Reader=&outBuf`
`145`	`145`
`146`	`146`	`args=append([]string{"-G"},args...)`
`147`	`147`	`cmd:=exec.CommandContext(ctx,"ssh",args...)`
`148`	`148`	`cmd.Env=append(cmd.Env,env...)`
`149`	`149`	`cmd.Stdout=&outBuf`
`150`		`-cmd.Stderr=&errBuf`
`151`	`150`	`err=cmd.Run()`
`152`	`151`	`iferr!=nil {`
`153`	`152`	`// If ssh -G failed, the SSH version is likely too old, fallback`
`154`	`153`	`// to using the default identity files.`
`155`	`154`	`r=strings.NewReader(fallbackIdentityFiles)`
`156`	`155`	`}`
`157`		`-iferrBuf.Len()>0 {`
`158`		`-returnnil,xerrors.Errorf("ssh -G encountered an error: %s",errBuf.String())`
`159`		`-}`
`160`	`156`
`161`	`157`	`s:=bufio.NewScanner(r)`
`162`	`158`	`fors.Scan() {`

Comments

(0)