Merge branch 'master' into master

This commit is contained in:
Mike McQuaid 2017-11-29 11:39:04 +00:00 committed by GitHub
commit 4bd184b706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -180,6 +180,7 @@ module Homebrew
"libecomlodr.dylib", # Symantec Endpoint Protection "libecomlodr.dylib", # Symantec Endpoint Protection
"libsymsea*.dylib", # Symantec Endpoint Protection "libsymsea*.dylib", # Symantec Endpoint Protection
"sentinel.dylib", # SentinelOne "sentinel.dylib", # SentinelOne
"sentinel-*.dylib", # SentinelOne
] ]
__check_stray_files "/usr/local/lib", "*.dylib", white_list, <<~EOS __check_stray_files "/usr/local/lib", "*.dylib", white_list, <<~EOS

View File

@ -88,8 +88,8 @@ then
PATH="/usr/bin:/bin:/usr/sbin:/sbin" PATH="/usr/bin:/bin:/usr/sbin:/sbin"
FILTERED_ENV=() FILTERED_ENV=()
for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS \ for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SUDO_ASKPASS
http_proxy https_proxy ftp_proxy no_proxy \ http_proxy HTTPS_PROXY FTP_PROXY \
"${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}" "${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}"
do do
# Skip if variable value is empty. # Skip if variable value is empty.