From ac2f52cef33bd374c945e51e9242859f0849bd73 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Tue, 24 May 2022 22:38:30 +1000 Subject: [PATCH 1/3] cask: fix greedy outdated command --- Library/Homebrew/cask/cask.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index 277518ea55..5e0d625615 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -166,13 +166,11 @@ module Cask version end - if greedy || greedy_latest || (greedy_auto_updates && auto_updates) - if latest_version.latest? - return versions if outdated_download_sha? + if latest_version.latest? + return versions if (greedy || greedy_latest) && outdated_download_sha? - return [] - end - elsif auto_updates + return [] + elsif auto_updates && !(greedy || greedy_auto_updates) return [] end From 6b155d9328704ee8bafd0f02bb07fe6da03eb6bd Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Sat, 28 May 2022 10:14:51 +1000 Subject: [PATCH 2/3] Update Library/Homebrew/cask/cask.rb Co-authored-by: Mike McQuaid --- Library/Homebrew/cask/cask.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index 5e0d625615..a7aa6a8ef4 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -170,7 +170,7 @@ module Cask return versions if (greedy || greedy_latest) && outdated_download_sha? return [] - elsif auto_updates && !(greedy || greedy_auto_updates) + elsif auto_updates && !greedy && !greedy_auto_updates return [] end From e64ab4c0f72a69c3f05f0e57119545ea3bde0e12 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Mon, 30 May 2022 18:30:18 +1000 Subject: [PATCH 3/3] Fix test --- Library/Homebrew/test/cask/cask_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/test/cask/cask_spec.rb b/Library/Homebrew/test/cask/cask_spec.rb index 8bda74354b..be59b6df8e 100644 --- a/Library/Homebrew/test/cask/cask_spec.rb +++ b/Library/Homebrew/test/cask/cask_spec.rb @@ -134,7 +134,7 @@ describe Cask::Cask, :cask do shared_examples ":latest cask" do |greedy, outdated_sha, tap_version, expectations| expectations.each do |installed_version, expected_output| context "when versions #{installed_version} are installed and the " \ - "tap version is #{tap_version}, #{"not " unless greedy}greedy" \ + "tap version is #{tap_version}, #{"not " unless greedy}greedy " \ "and sha is #{"not " unless outdated_sha}outdated" do subject { cask.outdated_versions(greedy: greedy) } @@ -160,7 +160,7 @@ describe Cask::Cask, :cask do describe "numbered version installed, :latest version in tap" do include_examples ":latest cask", false, false, "latest", - ["1.2.3"] => ["1.2.3"] + ["1.2.3"] => [] include_examples ":latest cask", true, false, "latest", ["1.2.3"] => [] include_examples ":latest cask", true, true, "latest",