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

Make new keep? superenv logic opt-in

Browse Source 
Closes #50425.

Signed-off-by: Misty De Meo <mistydemeo@github.com>
This commit is contained in:
Misty De Meo 2016-03-28 10:26:21 -07:00
parent 4fd5c5c159
commit f8cdab7d8a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/ENV/4.3/cc
View File

@ -201,6 +201,10 @@ class Cmd
end end
def keep?(path) def keep?(path)
# The logic in this method will eventually become the default,
# but is currently opt-in.
return keep_orig?(path) unless ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"]
# first two paths: reject references to Cellar or opt paths # first two paths: reject references to Cellar or opt paths
# for unspecified dependencies # for unspecified dependencies
if path.start_with?(cellar) || path.start_with?(opt) if path.start_with?(cellar) || path.start_with?(opt)
@ -213,6 +217,11 @@ class Cmd
end end
end end
# The original less-smart version of keep_orig; will eventually be removed
def keep_orig?(path)
path.start_with?(prefix, cellar, tmpdir) || !path.start_with?("/opt", "/sw", "/usr/X11")
end
def cflags def cflags
args = [] args = []

1
Library/Homebrew/cmd/test-bot.rb
View File

@ -856,6 +856,7 @@ module Homebrew
ENV["HOMEBREW_SANDBOX"] = "1" ENV["HOMEBREW_SANDBOX"] = "1"
ENV["HOMEBREW_NO_EMOJI"] = "1" ENV["HOMEBREW_NO_EMOJI"] = "1"
ENV["HOMEBREW_FAIL_LOG_LINES"] = "150" ENV["HOMEBREW_FAIL_LOG_LINES"] = "150"
ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1"
if ENV["TRAVIS"] if ENV["TRAVIS"]
ARGV << "--verbose" ARGV << "--verbose"