Skip to content

Commit 599a980

Browse files
authored
fix: sshd handle the error (#2026)
Signed-off-by: Keming <[email protected]>
1 parent af96cb3 commit 599a980

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

pkg/lang/ir/v1/pixi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
)
2424

2525
const (
26-
pixiVersion = "0.45.0"
26+
pixiVersion = "0.48.0"
2727
pixiConfigTemplate = `
2828
{{- if .UsePixiMirror -}}
2929
[mirrors]

pkg/lang/ir/v1/uv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package v1
1717
import "github.com/moby/buildkit/client/llb"
1818

1919
const (
20-
uvVersion = "0.6.5"
20+
uvVersion = "0.7.10"
2121
)
2222

2323
func (g generalGraph) compileUV(root llb.State) llb.State {

pkg/remote/sshd/sshd.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ func setWinSize(f *os.File, w, h int) {
256256
}
257257
}
258258

259-
func sendErrAndExit(logger *logrus.Entry, s ssh.Session, err error) {
260-
msg := strings.TrimPrefix(err.Error(), "exec: ")
259+
func sendErrAndExit(logger *logrus.Entry, s ssh.Session, exitErr error) {
260+
msg := strings.TrimPrefix(exitErr.Error(), "exec: ")
261261
if _, err := s.Stderr().Write([]byte(msg)); err != nil {
262262
logger.WithError(err).Errorf("failed to write error back to session")
263263
}
264264

265-
if err := s.Exit(getExitStatusFromError(err)); err != nil {
265+
if err := s.Exit(getExitStatusFromError(exitErr)); err != nil {
266266
logger.WithError(err).Errorf("pty session failed to exit")
267267
}
268268
}
@@ -272,7 +272,7 @@ func getExitStatusFromError(err error) int {
272272
return 0
273273
}
274274

275-
var exitErr exec.ExitError
275+
var exitErr *exec.ExitError
276276
if ok := errors.As(err, &exitErr); !ok {
277277
return 1
278278
}

0 commit comments

Comments
 (0)