Skip to content

Commit

Permalink
Fix Cask handling in brew deps and brew uses.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bo98 committed Mar 22, 2021
1 parent 555e936 commit ae2d0fb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Library/Homebrew/cmd/deps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ def deps
when :formula
sorted_dependents(Formula.installed)
when :cask
sorted_dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
sorted_dependents(Cask::Caskroom.casks)
else
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
sorted_dependents(Formula.installed + Cask::Caskroom.casks)
end
else
raise FormulaUnspecifiedError
Expand All @@ -118,9 +118,9 @@ def deps
when :formula
sorted_dependents(Formula.installed)
when :cask
sorted_dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
sorted_dependents(Cask::Caskroom.casks)
else
sorted_dependents(Formula.installed + Cask::Caskroom.casks(config: Cask::Config.from_args(args)))
sorted_dependents(Formula.installed + Cask::Caskroom.casks)
end
puts_deps sorted_dependents_formulae_and_casks, recursive: recursive, args: args
return
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/cmd/uses.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def intersection_of_dependents(use_runtime_dependents, used_formulae, args:)
end
if show_formulae_and_casks || args.cask?
deps += select_used_dependents(
dependents(Cask::Caskroom.casks(config: Cask::Config.from_args(args))),
dependents(Cask::Caskroom.casks),
used_formulae, recursive, includes, ignores
)
end
Expand All @@ -104,7 +104,7 @@ def intersection_of_dependents(use_runtime_dependents, used_formulae, args:)
deps += args.installed? ? Formula.installed : Formula.to_a
end
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

select_used_dependents(dependents(deps), used_formulae, recursive, includes, ignores)
Expand Down

0 comments on commit ae2d0fb

Please sign in to comment.