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

Merge pull request #19882 from Homebrew/forbid_casks_var_output

Browse Source 
cask/installer: output the correct environment variable.
This commit is contained in:
Mike McQuaid 2025-05-02 15:44:27 +00:00 committed by GitHub
commit 93e0e85352
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/cask/installer.rb
View File

@ -706,13 +706,17 @@ on_request: true)
cask_and_formula_dependencies.each do |dep_cask_or_formula| cask_and_formula_dependencies.each do |dep_cask_or_formula|
dep_name, dep_type, variable = if dep_cask_or_formula.is_a?(Cask) && forbidden_casks.present? dep_name, dep_type, variable = if dep_cask_or_formula.is_a?(Cask) && forbidden_casks.present?
dep_cask = dep_cask_or_formula dep_cask = dep_cask_or_formula
dep_cask_name = if forbid_casks ||forbidden_casks.include?(dep_cask.token) env_variable = "HOMEBREW_FORBIDDEN_CASKS"
dep_cask_name = if forbid_casks
env_variable = "HOMEBREW_FORBID_CASKS"
dep_cask.token
elsif forbidden_casks.include?(dep_cask.full_name)
dep_cask.token dep_cask.token
elsif dep_cask.tap.present? && elsif dep_cask.tap.present? &&
forbidden_casks.include?(dep_cask.full_name) forbidden_casks.include?(dep_cask.full_name)
dep_cask.full_name dep_cask.full_name
end end
[dep_cask_name, "cask", "HOMEBREW_FORBIDDEN_CASKS"] [dep_cask_name, "cask", env_variable]
elsif dep_cask_or_formula.is_a?(Formula) && forbidden_formulae.present? elsif dep_cask_or_formula.is_a?(Formula) && forbidden_formulae.present?
dep_formula = dep_cask_or_formula dep_formula = dep_cask_or_formula
formula_name = if forbidden_formulae.include?(dep_formula.name) formula_name = if forbidden_formulae.include?(dep_formula.name)
@ -734,7 +738,11 @@ on_request: true)
end end
return if !forbid_casks && forbidden_casks.blank? return if !forbid_casks && forbidden_casks.blank?
if forbid_casks || forbidden_casks.include?(@cask.token) variable = "HOMEBREW_FORBIDDEN_CASKS"
if forbid_casks
variable = "HOMEBREW_FORBID_CASKS"
@cask.token
elsif forbidden_casks.include?(@cask.token)
@cask.token @cask.token
elsif forbidden_casks.include?(@cask.full_name) elsif forbidden_casks.include?(@cask.full_name)
@cask.full_name @cask.full_name
@ -743,7 +751,7 @@ on_request: true)
end end
raise CaskCannotBeInstalledError.new(@cask, <<~EOS raise CaskCannotBeInstalledError.new(@cask, <<~EOS
forbidden for installation by #{owner} in `HOMEBREW_FORBIDDEN_CASKS`.#{owner_contact} forbidden for installation by #{owner} in `#{variable}`.#{owner_contact}
EOS EOS
) )
end end