From 240d2c34fb72a642a6163fa163bfd0b971761574 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 2 Feb 2021 11:53:51 +0000 Subject: [PATCH] utils/fork: fix bootsnap handling. Also, while we're here: - remove unused block argument - remove unneeded RuboCop disable comment --- Library/Homebrew/utils/fork.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/fork.rb b/Library/Homebrew/utils/fork.rb index e9eb1ea243..7094e7d8f4 100644 --- a/Library/Homebrew/utils/fork.rb +++ b/Library/Homebrew/utils/fork.rb @@ -29,12 +29,15 @@ module Utils error end - def self.safe_fork(&_block) + def self.safe_fork Dir.mktmpdir("homebrew", HOMEBREW_TEMP) do |tmpdir| UNIXServer.open("#{tmpdir}/socket") do |server| read, write = IO.pipe pid = fork do + # bootsnap doesn't like these forked processes + ENV["HOMEBREW_NO_BOOTSNAP"] = "1" + ENV["HOMEBREW_ERROR_PIPE"] = server.path server.close read.close @@ -56,7 +59,7 @@ module Utils write.close exit! - else # rubocop:disable Layout/ElseAlignment + else exit!(true) end