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

Merge pull request #2571 from danielmartin/revert-2517-fix-select-blocking

Browse Source 
Revert "Fix `IO#select` blocking."
This commit is contained in:
Markus Reiter 2017-05-01 16:37:56 +02:00 committed by GitHub
commit 8cba0352e0
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cask/lib/hbc/system_command.rb
View File

@ -92,25 +92,17 @@ module Hbc
def each_line_from(sources) def each_line_from(sources)
loop do loop do
selected_sources = IO.select(sources, [], [], 10) readable_sources = IO.select(sources)[0]
readable_sources.delete_if(&:eof?).first(1).each do |source|
break if selected_sources.nil?
readable_sources = selected_sources[0].delete_if(&:eof?)
readable_sources.each do |source|
type = (source == sources[0] ? :stdout : :stderr) type = (source == sources[0] ? :stdout : :stderr)
begin begin
yield(type, source.readline_nonblock || "") yield(type, source.readline_nonblock || "")
rescue IO::WaitReadable, EOFError rescue IO::WaitReadable, EOFError
next next
end end
end end
break if readable_sources.empty? break if readable_sources.empty?
end end
sources.each(&:close_read) sources.each(&:close_read)
end end