aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorMike McQuaid2017-01-17 14:22:03 +0000
committerGitHub2017-01-17 14:22:03 +0000
commita5019d281ef0757adcc0f4157e7f15495da01cdf (patch)
tree198890770d4210c26fa3dbcc7a1b5c0c8453c734 /Library/Homebrew/dev-cmd
parentd8730ecf0bca8a52d66c6a5e24b19dd8f79d4ab7 (diff)
parentdac66c4ada178c09b3b9b77feb2eaa7442b7443e (diff)
downloadbrew-a5019d281ef0757adcc0f4157e7f15495da01cdf.tar.bz2
Merge pull request #1851 from MikeMcQuaid/keg-only-version
Add `keg_only :versioned_formula`.
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/audit.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 394e0e763..281839621 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -459,6 +459,14 @@ class FormulaAuditor
end
def audit_conflicts
+ if formula.versioned_formula?
+ problem <<-EOS
+ Versioned formulae should not use `conflicts_with`.
+ Use `keg_only :versioned_formula` instead.
+ EOS
+ return
+ end
+
formula.conflicts.each do |c|
begin
Formulary.factory(c.name)
@@ -497,7 +505,7 @@ class FormulaAuditor
return unless @new_formula
return if formula.deprecated_options.empty?
- return if formula.name.include?("@")
+ return if formula.versioned_formula?
problem "New formulae should not use `deprecated_option`."
end