Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Cask handling in brew deps and brew uses. #10908

Merged
merged 1 commit into from Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Library/Homebrew/cmd/deps.rb
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
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