diff options
| author | Mike McQuaid | 2017-05-08 09:51:06 +0100 |
|---|---|---|
| committer | GitHub | 2017-05-08 09:51:06 +0100 |
| commit | f1d4c4be78905be0d5fd83922ff1262ed92ba4e8 (patch) | |
| tree | 5af3fb63bd3390bd18efcff3c3888a82ddd0852a /Library/Homebrew/formula_installer.rb | |
| parent | e4ecf6d6bc30914cc3bcb0a45ff2a573a920a844 (diff) | |
| parent | 9853a78397061cc6a550bc3a6c37d269d8be73eb (diff) | |
| download | brew-f1d4c4be78905be0d5fd83922ff1262ed92ba4e8.tar.bz2 | |
Merge pull request #2607 from MikeMcQuaid/travis-ci-tweaks-2
Travis CI tweaks.
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index db9115aae..ad87c2a5f 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -656,8 +656,9 @@ class FormulaInstaller Sandbox.print_sandbox_message if Sandbox.formula?(formula) Utils.safe_fork do - # Invalidate the current sudo timestamp in case a build script calls sudo - system "/usr/bin/sudo", "-k" + # Invalidate the current sudo timestamp in case a build script calls sudo. + # Travis CI's Linux sudoless workers have a weird sudo that fails here. + system "/usr/bin/sudo", "-k" unless ENV["TRAVIS_SUDO"] == "false" if Sandbox.formula?(formula) sandbox = Sandbox.new |