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

Remove --adopt switch from reinstall and upgrade

Browse Source
This commit is contained in:
Ian Gregory 2022-10-25 19:07:21 -04:00
parent 9256a01afe
commit a0f915169c
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cask/cmd/reinstall.rb
View File

@ -16,7 +16,6 @@ module Cask
binaries: args.binaries?, binaries: args.binaries?,
verbose: args.verbose?, verbose: args.verbose?,
force: args.force?, force: args.force?,
adopt: args.adopt?,
skip_cask_deps: args.skip_cask_deps?, skip_cask_deps: args.skip_cask_deps?,
require_sha: args.require_sha?, require_sha: args.require_sha?,
quarantine: args.quarantine?, quarantine: args.quarantine?,
@ -28,7 +27,6 @@ module Cask
*casks, *casks,
verbose: nil, verbose: nil,
force: nil, force: nil,
adopt: nil,
skip_cask_deps: nil, skip_cask_deps: nil,
binaries: nil, binaries: nil,
require_sha: nil, require_sha: nil,
@ -41,7 +39,6 @@ module Cask
binaries: binaries, binaries: binaries,
verbose: verbose, verbose: verbose,
force: force, force: force,
adopt: adopt,
skip_cask_deps: skip_cask_deps, skip_cask_deps: skip_cask_deps,
require_sha: require_sha, require_sha: require_sha,
quarantine: quarantine, quarantine: quarantine,

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

@ -13,10 +13,6 @@ module Cask
extend T::Sig extend T::Sig
OPTIONS = [ OPTIONS = [
[:switch, "--adopt", {
description: "Adopt existing artifacts in the destination that are identical to those being installed. " \
"Cannot be combined with --force.",
}],
[:switch, "--skip-cask-deps", { [:switch, "--skip-cask-deps", {
description: "Skip installing cask dependencies.", description: "Skip installing cask dependencies.",
}], }],
@ -70,7 +66,6 @@ module Cask
casks: Cask, casks: Cask,
args: Homebrew::CLI::Args, args: Homebrew::CLI::Args,
force: T.nilable(T::Boolean), force: T.nilable(T::Boolean),
adopt: T.nilable(T::Boolean),
greedy: T.nilable(T::Boolean), greedy: T.nilable(T::Boolean),
greedy_latest: T.nilable(T::Boolean), greedy_latest: T.nilable(T::Boolean),
greedy_auto_updates: T.nilable(T::Boolean), greedy_auto_updates: T.nilable(T::Boolean),
@ -86,7 +81,6 @@ module Cask
*casks, *casks,
args:, args:,
force: false, force: false,
adopt: false,
greedy: false, greedy: false,
greedy_latest: false, greedy_latest: false,
greedy_auto_updates: false, greedy_auto_updates: false,
@ -162,7 +156,7 @@ module Cask
upgradable_casks.each do |(old_cask, new_cask)| upgradable_casks.each do |(old_cask, new_cask)|
upgrade_cask( upgrade_cask(
old_cask, new_cask, old_cask, new_cask,
binaries: binaries, force: force, adopt: adopt, skip_cask_deps: skip_cask_deps, verbose: verbose, binaries: binaries, force: force, skip_cask_deps: skip_cask_deps, verbose: verbose,
quarantine: quarantine, require_sha: require_sha quarantine: quarantine, require_sha: require_sha
) )
rescue => e rescue => e
@ -177,7 +171,7 @@ module Cask
def self.upgrade_cask( def self.upgrade_cask(
old_cask, new_cask, old_cask, new_cask,
binaries:, force:, adopt:, quarantine:, require_sha:, skip_cask_deps:, verbose: binaries:, force:, quarantine:, require_sha:, skip_cask_deps:, verbose:
) )
require "cask/installer" require "cask/installer"
@ -201,7 +195,6 @@ module Cask
binaries: binaries, binaries: binaries,
verbose: verbose, verbose: verbose,
force: force, force: force,
adopt: adopt,
skip_cask_deps: skip_cask_deps, skip_cask_deps: skip_cask_deps,
require_sha: require_sha, require_sha: require_sha,
upgrade: true, upgrade: true,

1
Library/Homebrew/cmd/reinstall.rb
View File

@ -152,7 +152,6 @@ module Homebrew
binaries: args.binaries?, binaries: args.binaries?,
verbose: args.verbose?, verbose: args.verbose?,
force: args.force?, force: args.force?,
adopt: args.adopt?,
require_sha: args.require_sha?, require_sha: args.require_sha?,
skip_cask_deps: args.skip_cask_deps?, skip_cask_deps: args.skip_cask_deps?,
quarantine: args.quarantine?, quarantine: args.quarantine?,

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

@ -97,7 +97,6 @@ module Homebrew
cask_options cask_options
conflicts "--build-from-source", "--force-bottle" conflicts "--build-from-source", "--force-bottle"
conflicts "--adopt", "--force"
named_args [:outdated_formula, :outdated_cask] named_args [:outdated_formula, :outdated_cask]
end end
@ -227,7 +226,6 @@ module Homebrew
Cask::Cmd::Upgrade.upgrade_casks( Cask::Cmd::Upgrade.upgrade_casks(
*casks, *casks,
force: args.force?, force: args.force?,
adopt: args.adopt?,
greedy: args.greedy?, greedy: args.greedy?,
greedy_latest: args.greedy_latest?, greedy_latest: args.greedy_latest?,
greedy_auto_updates: args.greedy_auto_updates?, greedy_auto_updates: args.greedy_auto_updates?,