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

Apply feedback

Browse Source
This commit is contained in:
Rylan Polster 2023-12-16 20:08:42 -05:00
parent 472dd95b16
commit 6431822e7b
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,11 +127,12 @@ on_request: true)
def check_deprecate_disable def check_deprecate_disable
deprecate_disable_type = DeprecateDisable.type(@cask) deprecate_disable_type = DeprecateDisable.type(@cask)
return if deprecate_disable_type.blank? return if deprecate_disable_type.nil?
if deprecate_disable_type == :deprecated case deprecate_disable_type
when :deprecated
opoo "#{@cask.token} has been #{DeprecateDisable.message(@cask)}" opoo "#{@cask.token} has been #{DeprecateDisable.message(@cask)}"
elsif deprecate_disable_type == :disabled when :disabled
raise CaskCannotBeInstalledError.new(@cask, DeprecateDisable.message(@cask)) raise CaskCannotBeInstalledError.new(@cask, DeprecateDisable.message(@cask))
end end
end end

14
Library/Homebrew/deprecate_disable.rb
View File

@ -7,11 +7,6 @@
module DeprecateDisable module DeprecateDisable
module_function module_function
SHARED_DEPRECATE_DISABLE_REASONS = {
repo_archived: "has an archived upstream repository",
repo_removed: "has a removed upstream repository",
}.freeze
FORMULA_DEPRECATE_DISABLE_REASONS = { FORMULA_DEPRECATE_DISABLE_REASONS = {
does_not_build: "does not build", does_not_build: "does not build",
no_license: "has no license", no_license: "has no license",
@ -25,19 +20,16 @@ module DeprecateDisable
"a different checksum than the current one. " \ "a different checksum than the current one. " \
"Upstream's repository might have been compromised. " \ "Upstream's repository might have been compromised. " \
"We can re-package this once upstream has confirmed that they retagged their release", "We can re-package this once upstream has confirmed that they retagged their release",
**SHARED_DEPRECATE_DISABLE_REASONS,
}.freeze }.freeze
CASK_DEPRECATE_DISABLE_REASONS = { CASK_DEPRECATE_DISABLE_REASONS = {
discontinued: "is discontinued upstream", discontinued: "is discontinued upstream",
unsigned_artifact: "has an unsigned binary which prevents it from running on Apple Silicon devices " \
"under standard macOS security policy",
**SHARED_DEPRECATE_DISABLE_REASONS,
}.freeze }.freeze
def type(formula_or_cask) def type(formula_or_cask)
return :deprecated if formula_or_cask.deprecated? return :deprecated if formula_or_cask.deprecated?
return :disabled if formula_or_cask.disabled?
:disabled if formula_or_cask.disabled?
end end
def message(formula_or_cask) def message(formula_or_cask)

5
Library/Homebrew/formula_installer.rb
View File

@ -204,9 +204,10 @@ class FormulaInstaller
if deprecate_disable_type.present? if deprecate_disable_type.present?
message = "#{formula.full_name} has been #{DeprecateDisable.message(formula)}" message = "#{formula.full_name} has been #{DeprecateDisable.message(formula)}"
if deprecate_disable_type == :deprecated case deprecate_disable_type
when :deprecated
opoo message opoo message
elsif deprecate_disable_type == :disabled when :disabled
raise CannotInstallFormulaError, message raise CannotInstallFormulaError, message
end end
end end