kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from thockin/v3-trimspace 

TrimSpace exec's stdout/stderr for log (v3)
This commit is contained in:
Kubernetes Prow Robot 2022-03-20 13:33:10 -07:00 committed by GitHub
parent d1c8a4277c d953c0bf59
commit 425915398d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/cmd.go
View File

@ -61,8 +61,8 @@ func (c *Runner) RunWithStdin(ctx context.Context, cwd string, env []string, std
cmd.Stdin = bytes.NewBufferString(stdin) cmd.Stdin = bytes.NewBufferString(stdin)
err := cmd.Run() err := cmd.Run()
stdout := outbuf.String() stdout := strings.TrimSpace(outbuf.String())
stderr := errbuf.String() stderr := strings.TrimSpace(errbuf.String())
if ctx.Err() == context.DeadlineExceeded { if ctx.Err() == context.DeadlineExceeded {
return "", fmt.Errorf("Run(%s): %w: { stdout: %q, stderr: %q }", cmdStr, ctx.Err(), stdout, stderr) return "", fmt.Errorf("Run(%s): %w: { stdout: %q, stderr: %q }", cmdStr, ctx.Err(), stdout, stderr)
} }