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

Merge pull request #15382 from carlocab/better-sorbet-fix

Browse Source 
fetch: better typechecking fix
This commit is contained in:
Carlo Cabrera 2023-05-08 22:21:56 +08:00 committed by GitHub
commit 8cb03851a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/os/mac/utils/bottles.rb
View File

@ -7,7 +7,7 @@ module Utils
undef tag undef tag
def tag(symbol = nil) def tag(symbol = nil)
return Utils::Bottles::Tag.from_symbol(symbol.to_sym) if symbol.present? return Utils::Bottles::Tag.from_symbol(symbol) if symbol.present?
Utils::Bottles::Tag.new(system: MacOS.version.to_sym, arch: Hardware::CPU.arch) Utils::Bottles::Tag.new(system: MacOS.version.to_sym, arch: Hardware::CPU.arch)
end end

2
Library/Homebrew/fetch.rb
View File

@ -9,7 +9,7 @@ module Homebrew
bottle = formula.bottle bottle = formula.bottle
return true if args.force_bottle? && bottle.present? return true if args.force_bottle? && bottle.present?
return true if args.bottle_tag.present? && formula.bottled?(args.bottle_tag) return true if args.bottle_tag.present? && formula.bottled?(args.bottle_tag&.to_sym)
bottle.present? && bottle.present? &&
formula.pour_bottle? && formula.pour_bottle? &&

2
Library/Homebrew/utils/bottles.rb
View File

@ -11,7 +11,7 @@ module Utils
class << self class << self
# Gets the tag for the running OS. # Gets the tag for the running OS.
def tag(symbol = nil) def tag(symbol = nil)
return Tag.from_symbol(symbol.to_sym) if symbol.present? return Tag.from_symbol(symbol) if symbol.present?
@tag ||= Tag.new(system: HOMEBREW_SYSTEM.downcase.to_sym, @tag ||= Tag.new(system: HOMEBREW_SYSTEM.downcase.to_sym,
arch: HOMEBREW_PROCESSOR.downcase.to_sym) arch: HOMEBREW_PROCESSOR.downcase.to_sym)