diff --git a/Library/Homebrew/extend/kernel.rb b/Library/Homebrew/extend/kernel.rb index cc4f82d6a7..0fed83aafd 100644 --- a/Library/Homebrew/extend/kernel.rb +++ b/Library/Homebrew/extend/kernel.rb @@ -351,7 +351,7 @@ module Kernel IGNORE_INTERRUPTS_MUTEX = Thread::Mutex.new.freeze - def ignore_interrupts(_opt = nil) + def ignore_interrupts(quiet: false) IGNORE_INTERRUPTS_MUTEX.synchronize do # rubocop:disable Style/GlobalVars $ignore_interrupts_nesting_level = 0 unless defined?($ignore_interrupts_nesting_level) @@ -360,8 +360,11 @@ module Kernel $ignore_interrupts_interrupted = false unless defined?($ignore_interrupts_interrupted) old_sigint_handler = trap(:INT) do $ignore_interrupts_interrupted = true - $stderr.print "\n" - $stderr.puts "One sec, cleaning up..." + + unless quiet + $stderr.print "\n" + $stderr.puts "One sec, cleaning up..." + end end begin diff --git a/Library/Homebrew/utils/fork.rb b/Library/Homebrew/utils/fork.rb index 7334225321..117b680ff9 100644 --- a/Library/Homebrew/utils/fork.rb +++ b/Library/Homebrew/utils/fork.rb @@ -75,7 +75,7 @@ module Utils exit!(true) end - ignore_interrupts(:quietly) do # the child will receive the interrupt and marshal it back + ignore_interrupts(quiet: true) do # the child will receive the interrupt and marshal it back begin socket = server.accept_nonblock rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR