From 19f41bddfdf369c459dc3f3f6eeace012809384b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Meireles?= Date: Fri, 22 Jan 2021 17:22:23 +0000 Subject: [PATCH 1/2] Properly allow quarantine in 'upgrade' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit issue was raised in #9139 for upgrade/reinstall --cask and was then closed by #10284. Issue is that #10284 only actually fixed the reinstall command, leaving behindd the 'upgrade' one which this now fixes. Signed-off-by: António Meireles --- Library/Homebrew/cmd/upgrade.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 89280370e1..8e3ef71c6c 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -188,8 +188,8 @@ module Homebrew force: args.force?, greedy: args.greedy?, dry_run: args.dry_run?, + quarantine: args.quarantine?, binaries: EnvConfig.cask_opts_binaries?, - quarantine: EnvConfig.cask_opts_quarantine?, require_sha: EnvConfig.cask_opts_require_sha?, skip_cask_deps: args.skip_cask_deps?, verbose: args.verbose?, From 9a99c40e3784baf2e4e9b205da9a237eb22a6f0c Mon Sep 17 00:00:00 2001 From: Seeker Date: Fri, 22 Jan 2021 13:52:42 -0800 Subject: [PATCH 2/2] Fix remaining broken cask options in `upgrade` --- Library/Homebrew/cmd/upgrade.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 8e3ef71c6c..56155ffa53 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -188,9 +188,9 @@ module Homebrew force: args.force?, greedy: args.greedy?, dry_run: args.dry_run?, + binaries: args.binaries?, quarantine: args.quarantine?, - binaries: EnvConfig.cask_opts_binaries?, - require_sha: EnvConfig.cask_opts_require_sha?, + require_sha: args.require_sha?, skip_cask_deps: args.skip_cask_deps?, verbose: args.verbose?, args: args,