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

upgrade: use greedy_* method parameters

Browse Source
This commit is contained in:
fn ⌃ ⌥ 2021-09-21 11:45:18 -07:00
parent 1f3de1d5b2
commit 8dc060c88b
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cask/cmd/upgrade.rb
View File

@ -95,8 +95,8 @@ module Cask
outdated_casks = if casks.empty?
Caskroom.casks(config: Config.from_args(args)).select do |cask|
cask.outdated?(greedy: greedy, greedy_latest: args.greedy_latest?,
greedy_auto_updates: args.greedy_auto_updates?)
cask.outdated?(greedy: greedy, greedy_latest: greedy_latest,
greedy_auto_updates: greedy_auto_updates)
end
else
casks.select do |cask|
@ -120,14 +120,14 @@ module Cask
return false if outdated_casks.empty?
if casks.empty? && !greedy
if !args.greedy_auto_updates? && !args.greedy_latest?
ohai "Casks with 'auto_updates true' or 'version :latest'
will not be upgraded; pass `--greedy` to upgrade them."
if !greedy_auto_updates && !greedy_latest
ohai "Casks with 'auto_updates true' or 'version :latest' " \
"will not be upgraded; pass `--greedy` to upgrade them."
end
if args.greedy_auto_updates? && !args.greedy_latest?
if greedy_auto_updates && !greedy_latest
ohai "Casks with 'version :latest' will not be upgraded; pass `--greedy-latest` to upgrade them."
end
if !args.greedy_auto_updates? && args.greedy_latest?
if !greedy_auto_updates && greedy_latest
ohai "Casks with 'auto_updates true' will not be upgraded; pass `--greedy-auto-updates` to upgrade them."
end
end

20
Library/Homebrew/cmd/upgrade.rb
View File

@ -234,15 +234,17 @@ module Homebrew
Cask::Cmd::Upgrade.upgrade_casks(
*casks,
force: args.force?,
greedy: args.greedy?,
dry_run: args.dry_run?,
binaries: args.binaries?,
quarantine: args.quarantine?,
require_sha: args.require_sha?,
skip_cask_deps: args.skip_cask_deps?,
verbose: args.verbose?,
args: args,
force: args.force?,
greedy: args.greedy?,
greedy_latest: args.greedy_latest?,
greedy_auto_updates: args.greedy_auto_updates?,
dry_run: args.dry_run?,
binaries: args.binaries?,
quarantine: args.quarantine?,
require_sha: args.require_sha?,
skip_cask_deps: args.skip_cask_deps?,
verbose: args.verbose?,
args: args,
)
end
end