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

Apply suggestions from code review

Browse Source 
Co-authored-by: Xuehai Pan <XuehaiPan@outlook.com>
This commit is contained in:
Mike McQuaid 2021-10-21 15:10:17 +01:00 committed by GitHub
parent eb1b244fd2
commit 0118e6ec41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/update-report.rb
View File

@ -48,7 +48,8 @@ module Homebrew
if ENV["HOMEBREW_CORE_DEFAULT_GIT_REMOTE"] != ENV["HOMEBREW_CORE_GIT_REMOTE"]
opoo <<~EOS
HOMEBREW_CORE_GIT_REMOTE was set. It has been unset for the migration.
HOMEBREW_CORE_GIT_REMOTE was set: #{ENV["HOMEBREW_CORE_GIT_REMOTE"]}.
It has been unset for the migration.
You may need to change this from a linuxbrew-core mirror to a homebrew-core one.
EOS
@ -57,8 +58,9 @@ module Homebrew
if ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] != ENV["HOMEBREW_BOTTLE_DOMAIN"]
opoo <<~EOS
HOMEBREW_BOTTLE_DOMAIN was set. It has been unset for the migration.
You may need to change this Linuxbrew packages to Homebrew packages.
HOMEBREW_BOTTLE_DOMAIN was set: #{ENV["HOMEBREW_BOTTLE_DOMAIN"]}.
It has been unset for the migration.
You may need to change this from a Linuxbrew package mirror to a Homebrew one.
EOS
end

8
Library/Homebrew/extend/os/linux/diagnostic.rb
View File

@ -130,12 +130,12 @@ module Homebrew
end
def check_linuxbrew_bottle_domain
return unless Homebrew::EnvConfig.bottle_domain.include?("linuxbrew-core")
return unless Homebrew::EnvConfig.bottle_domain.include?("linuxbrew")
<<~EOS
Your HOMEBREW_BOTTLE_DOMAIN still contains linuxbrew-core.
You must unset it (or adjust it to not contain linuxbrew-core
e.g. by using homebrew-core instead).
Your HOMEBREW_BOTTLE_DOMAIN still contains "linuxbrew".
You must unset it (or adjust it to not contain linuxbrew
e.g. by using homebrew instead).
EOS
end
end