From ddb630b01cc0178be8bb78e2fdeb13265346be0d Mon Sep 17 00:00:00 2001
From: Xu Cheng <xucheng@me.com>
Date: Fri, 28 Aug 2015 13:08:17 +0800
Subject: [PATCH] move sudo -k to formula_installer
sudo -k cannot be used inside sandbox
Closes Homebrew/homebrew#43345.
Signed-off-by: Xu Cheng <xucheng@me.com>
---
Library/Homebrew/build.rb | 3 ---
Library/Homebrew/formula_installer.rb | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 8442801a73..d226cf9bdc 100644
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -168,9 +168,6 @@ begin
error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io)
error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
- # Invalidate the current sudo timestamp in case a build script calls sudo
- system "/usr/bin/sudo", "-k"
-
trap("INT", old_trap)
formula = ARGV.formulae.first
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index c3de16cfdc..72ae9a87e0 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -547,6 +547,9 @@ class FormulaInstaller
end
Utils.safe_fork do
+ # Invalidate the current sudo timestamp in case a build script calls sudo
+ system "/usr/bin/sudo", "-k"
+
if Sandbox.available? && ARGV.sandbox? && !Sandbox.auto_disable?
sandbox = Sandbox.new
formula.logs.mkpath
--
GitLab