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

Merge pull request #10908 from Bo98/deps-uses-cask

Browse Source 
Fix Cask handling in `brew deps` and `brew uses`.
This commit is contained in:
Bo Anderson 2021-03-22 22:56:10 +00:00 committed by GitHub
commit 28b1765679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/deps.rb
View File

@ -93,9 +93,9 @@ module Homebrew
when :formula when :formula
sorted_dependents(Formula.installed) sorted_dependents(Formula.installed)
when :cask when :cask
sorted_dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args))) sorted_dependents(Cask::Caskroom.casks)
else else
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args))) sorted_dependents(Formula.installed + Cask::Caskroom.casks)
end end
else else
raise FormulaUnspecifiedError raise FormulaUnspecifiedError
@ -118,9 +118,9 @@ module Homebrew
when :formula when :formula
sorted_dependents(Formula.installed) sorted_dependents(Formula.installed)
when :cask when :cask
sorted_dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args))) sorted_dependents(Cask::Caskroom.casks)
else else
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args))) sorted_dependents(Formula.installed + Cask::Caskroom.casks)
end end
puts_deps sorted_dependents_formulae_and_casks, recursive: recursive, args: args puts_deps sorted_dependents_formulae_and_casks, recursive: recursive, args: args
return return

4
Library/Homebrew/cmd/uses.rb
View File

@ -93,7 +93,7 @@ module Homebrew
end end
if show_formulae_and_casks || args.cask? if show_formulae_and_casks || args.cask?
deps += select_used_dependents( deps += select_used_dependents(
dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args))), dependents(Cask::Caskroom.casks),
used_formulae, recursive, includes, ignores used_formulae, recursive, includes, ignores
) )
end end
@ -104,7 +104,7 @@ module Homebrew
deps += args.installed? ? Formula.installed : Formula.to_a deps += args.installed? ? Formula.installed : Formula.to_a
end end
if show_formulae_and_casks || args.cask? if show_formulae_and_casks || args.cask?
deps += args.installed? ? Cask::Caskroom.casks(config: Cask::Config.from_args(args)) : Cask::Cask.to_a deps += args.installed? ? Cask::Caskroom.casks : Cask::Cask.to_a
end end
select_used_dependents(dependents(deps), used_formulae, recursive, includes, ignores) select_used_dependents(dependents(deps), used_formulae, recursive, includes, ignores)