Skip to content

Commit

Permalink
Merge pull request #797 from neogopher/fix-ssh-helper-crash-on-windows
Browse files Browse the repository at this point in the history
Use correct context for the ssh server helper command
  • Loading branch information
pascalbreuninger authored Nov 2, 2023
2 parents e255469 + c2524f4 commit ef1b0bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/devcontainer/sshtunnel/sshtunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func ExecuteCommand(ctx context.Context, client client2.WorkspaceClient, agentIn
defer writer.Close()

log.Debugf("Inject and run command: %s", sshCommand)
err := agentInject(cancelCtx, sshCommand, sshTunnelStdinReader, sshTunnelStdoutWriter, writer)
err := agentInject(ctx, sshCommand, sshTunnelStdinReader, sshTunnelStdoutWriter, writer)
if err != nil && !errors.Is(err, context.Canceled) && !strings.Contains(err.Error(), "signal: ") {
errChan <- fmt.Errorf("executing agent command: %w", err)
} else {
Expand Down

0 comments on commit ef1b0bd

Please sign in to comment.