mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
Merge pull request #20195 from tyuwags/ask-option-refactoring
Ask option refactoring
This commit is contained in:
commit
57024a9f2d
@ -470,7 +470,7 @@ module Homebrew
|
|||||||
end.flat_map(&:to_formula)]
|
end.flat_map(&:to_formula)]
|
||||||
end.flatten.uniq
|
end.flatten.uniq
|
||||||
formulae_dependencies.concat(dependants.upgradeable) if dependants&.upgradeable
|
formulae_dependencies.concat(dependants.upgradeable) if dependants&.upgradeable
|
||||||
formulae_dependencies
|
formulae_dependencies.uniq
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -84,7 +84,7 @@ module Homebrew
|
|||||||
keg = install_context.keg
|
keg = install_context.keg
|
||||||
formula = install_context.formula
|
formula = install_context.formula
|
||||||
options = install_context.options
|
options = install_context.options
|
||||||
link_keg = keg.linked?
|
link_keg = keg&.linked?
|
||||||
formula_installer.prelude
|
formula_installer.prelude
|
||||||
formula_installer.fetch
|
formula_installer.fetch
|
||||||
|
|
||||||
|
@ -375,6 +375,10 @@ module Homebrew
|
|||||||
puts formulae_upgrades.join(", ")
|
puts formulae_upgrades.join(", ")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
upgradeable.reject! { |f| FormulaInstaller.installed.include?(f) }
|
||||||
|
|
||||||
|
return if upgradeable.blank?
|
||||||
|
|
||||||
unless dry_run
|
unless dry_run
|
||||||
dependent_installers = formula_installers(
|
dependent_installers = formula_installers(
|
||||||
upgradeable,
|
upgradeable,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user