aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2017-01-17 21:12:37 +0000
committerGitHub2017-01-17 21:12:37 +0000
commit950e27927b9bca7ad83df0b83f64beac61274046 (patch)
tree105a4e8ed3d721d02c29079a67d7b33ddacb142b /Library
parentffa5ebde53139bd856e834001ba479071874f8fb (diff)
parent4f0505f759d355d6a514485733c0ea3349711655 (diff)
downloadbrew-950e27927b9bca7ad83df0b83f64beac61274046.tar.bz2
Merge pull request #1869 from MikeMcQuaid/versioned_formula_conflicts_fix
audit: only warn on versioned conflicts_with.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/dev-cmd/audit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 281839621..594555695 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -459,7 +459,7 @@ class FormulaAuditor
end
def audit_conflicts
- if formula.versioned_formula?
+ if formula.conflicts.any? && formula.versioned_formula?
problem <<-EOS
Versioned formulae should not use `conflicts_with`.
Use `keg_only :versioned_formula` instead.