Skip to content

Commit

Permalink
Merge pull request #230 from grigorye/bug/shell-hangup-due-to-unread-…
Browse files Browse the repository at this point in the history
…pipe

Fixed task hang up in shellInternal due to unread error pipe.
  • Loading branch information
polac24 authored Nov 22, 2023
2 parents 64472d5 + 62ace6a commit 487a58a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Sources/XCRemoteCache/Shell/Shell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ private func shellInternal(_ cmd: String, args: [String] = [], stdout: PipeLike?
task.currentDirectoryPath = dir
}
task.launch()
let errorData = (stderr != nil) ? nil : errorHandle.fileHandleForReading.readDataToEndOfFile()
task.waitUntilExit()
if task.terminationStatus != 0 {
if stderr != nil {
guard let errorData = errorData else {
// Error stream was captured so cannot inspect its content
throw ShellError.statusError("Failed command", task.terminationStatus)
}
let errorData = errorHandle.fileHandleForReading.readDataToEndOfFile()
let errorString = String(data: errorData, encoding: .utf8)?.trim() ?? "No error returned from the process."
throw ShellError.statusError(
"status \(task.terminationStatus): \(errorString)", task.terminationStatus
Expand Down

0 comments on commit 487a58a

Please sign in to comment.