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

dev-cmd/bottle: don't take uniq of arguments

Browse Source
This commit is contained in:
Bo Anderson 2021-04-08 22:05:02 +01:00
parent 093e6e4f79
commit 2f041abf2b
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Homebrew/cli/named_args.rb
View File

@ -44,10 +44,14 @@ module Homebrew
# If both a formula and cask with the same name exist, returns # If both a formula and cask with the same name exist, returns
# the formula and prints a warning unless `only` is specified. # the formula and prints a warning unless `only` is specified.
sig { sig {
params(only: T.nilable(Symbol), ignore_unavailable: T.nilable(T::Boolean), method: T.nilable(Symbol)) params(
.returns(T::Array[T.any(Formula, Keg, Cask::Cask)]) only: T.nilable(Symbol),
ignore_unavailable: T.nilable(T::Boolean),
method: T.nilable(Symbol),
uniq: T::Boolean,
).returns(T::Array[T.any(Formula, Keg, Cask::Cask)])
} }
def to_formulae_and_casks(only: parent&.only_formula_or_cask, ignore_unavailable: nil, method: nil) def to_formulae_and_casks(only: parent&.only_formula_or_cask, ignore_unavailable: nil, method: nil, uniq: true)
@to_formulae_and_casks ||= {} @to_formulae_and_casks ||= {}
@to_formulae_and_casks[only] ||= downcased_unique_named.flat_map do |name| @to_formulae_and_casks[only] ||= downcased_unique_named.flat_map do |name|
load_formula_or_cask(name, only: only, method: method) load_formula_or_cask(name, only: only, method: method)
@ -59,7 +63,13 @@ module Homebrew
raise raise
rescue NoSuchKegError, FormulaUnavailableError, Cask::CaskUnavailableError, FormulaOrCaskUnavailableError rescue NoSuchKegError, FormulaUnavailableError, Cask::CaskUnavailableError, FormulaOrCaskUnavailableError
ignore_unavailable ? [] : raise ignore_unavailable ? [] : raise
end.uniq.freeze end.freeze
if uniq
@to_formulae_and_casks[only].uniq.freeze
else
@to_formulae_and_casks[only]
end
end end
def to_formulae_to_casks(only: parent&.only_formula_or_cask, method: nil) def to_formulae_to_casks(only: parent&.only_formula_or_cask, method: nil)
@ -149,9 +159,9 @@ module Homebrew
end end
private :resolve_formula private :resolve_formula
sig { returns(T::Array[Formula]) } sig { params(uniq: T::Boolean).returns(T::Array[Formula]) }
def to_resolved_formulae def to_resolved_formulae(uniq: true)
@to_resolved_formulae ||= to_formulae_and_casks(only: :formula, method: :resolve) @to_resolved_formulae ||= to_formulae_and_casks(only: :formula, method: :resolve, uniq: uniq)
.freeze .freeze
end end

2
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -91,7 +91,7 @@ module Homebrew
return merge(args: args) if args.merge? return merge(args: args) if args.merge?
ensure_relocation_formulae_installed! unless args.skip_relocation? ensure_relocation_formulae_installed! unless args.skip_relocation?
args.named.to_resolved_formulae.each do |f| args.named.to_resolved_formulae(uniq: false).each do |f|
bottle_formula f, args: args bottle_formula f, args: args
end end
end end