admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #17835 from Homebrew/system_command-ebadf

Browse Source 
system_command: fix EBADF on Ctrl+C
This commit is contained in:
Bo Anderson 2024-07-23 20:32:35 +01:00 committed by GitHub
commit 8e8ce4a2f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/system_command.rb
View File

@ -265,15 +265,16 @@ class SystemCommand
raise Timeout::Error if raw_wait_thr.join(Utils::Timer.remaining(end_time)).nil? raise Timeout::Error if raw_wait_thr.join(Utils::Timer.remaining(end_time)).nil?
@status = raw_wait_thr.value @status = raw_wait_thr.value
thread_ready_queue.pop
line_thread.raise ProcessTerminatedInterrupt.new
thread_done_queue << true
line_thread.join
rescue Interrupt rescue Interrupt
Process.kill("INT", raw_wait_thr.pid) if raw_wait_thr && !sudo? Process.kill("INT", raw_wait_thr.pid) if raw_wait_thr && !sudo?
raise Interrupt raise Interrupt
ensure ensure
if line_thread
thread_ready_queue.pop
line_thread.raise ProcessTerminatedInterrupt.new
thread_done_queue << true
line_thread.join
end
raw_stdin&.close raw_stdin&.close
raw_stdout&.close raw_stdout&.close
raw_stderr&.close raw_stderr&.close