Skip to content

Commit

Permalink
Fixed task hang up in shellInternal due to unread error pipe.
Browse files Browse the repository at this point in the history
  • Loading branch information
grigorye committed Nov 20, 2023
1 parent 64472d5 commit 4330b9b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion 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 = errorHandle.fileHandleForReading.readDataToEndOfFile()
task.waitUntilExit()
if task.terminationStatus != 0 {
if stderr != nil {
// 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 4330b9b

Please sign in to comment.