From 76ec69e3c31eb2c666de46109d6b7e85891a5d88 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Wed, 2 Sep 2020 14:52:25 -0400 Subject: [PATCH] audit: compare current version to last committed version when seeing if revision should be removed --- Library/Homebrew/dev-cmd/audit.rb | 3 ++- Library/Homebrew/test/dev-cmd/audit_spec.rb | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index ebc4773f91..594c9611eb 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -891,7 +891,8 @@ module Homebrew end end - if previous_version != newest_committed_version && + if (previous_version != newest_committed_version || + current_version != newest_committed_version) && !current_revision.zero? && current_revision == newest_committed_revision && current_revision == previous_revision diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb index c0895c2db0..fc6feb77bb 100644 --- a/Library/Homebrew/test/dev-cmd/audit_spec.rb +++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb @@ -727,6 +727,12 @@ module Homebrew it { is_expected.to match("'revision 2' should be removed") } end + context "should be removed with a newer local version" do + before { formula_gsub "foo-1.0.tar.gz", "foo-1.1.tar.gz" } + + it { is_expected.to match("'revision 2' should be removed") } + end + context "should not warn on an newer version revision removal" do before do formula_gsub_origin_commit "revision 2", ""