From 5e0b3d24e5f2a59bf715e34e8c0a62c1307d474d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 15 Nov 2016 09:02:50 +0000 Subject: [PATCH] audit: fix "version should not decrease" (again). - output the max version and current version to make the message more obvious. - Don't compare the development spec version to the formula version and then complain the formula version is lower (it should always be!) --- Library/Homebrew/dev-cmd/audit.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 9024cf50c0e2f..6c21c25dee469 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -674,8 +674,10 @@ def audit_revision_and_version_scheme attributes_for_version = spec_attribute_map[formula.version] next if attributes_for_version.nil? || attributes_for_version.empty? - if formula.send(attribute) < attributes_for_version.max - problem "#{spec} #{attribute} should not decrease" + old_attribute = formula.send(attribute) + max_attribute = attributes_for_version.max + if max_attribute && old_attribute < max_attribute + problem "#{spec} #{attribute} should not decrease (from #{max_attribute} to #{old_attribute})" end end @@ -687,8 +689,11 @@ def audit_revision_and_version_scheme version_scheme.first == max_version_scheme end.keys.max - if max_version && formula.version < max_version - problem "#{spec} version should not decrease" + formula_spec = formula.send(spec) + next if formula_spec.nil? + + if max_version && formula_spec.version < max_version + problem "#{spec} version should not decrease (from #{max_version} to #{formula_spec.version})" end end