aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd/audit.rb
diff options
context:
space:
mode:
authorMike McQuaid2017-09-29 16:23:02 +0100
committerMike McQuaid2017-09-29 16:23:02 +0100
commit134bd00d10a8feef63bd2583e117dc51be230db3 (patch)
tree47d1b71697dd4edae6e52548a98ced14eada5379 /Library/Homebrew/dev-cmd/audit.rb
parent22e329fb02329f9d270a1a0b82fb6227dcd91d26 (diff)
downloadbrew-134bd00d10a8feef63bd2583e117dc51be230db3.tar.bz2
audit: don't care about shadowing official taps.
We're trying to import all of these formulae anyway.
Diffstat (limited to 'Library/Homebrew/dev-cmd/audit.rb')
-rw-r--r--Library/Homebrew/dev-cmd/audit.rb32
1 files changed, 3 insertions, 29 deletions
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index a7d498c0d..49e7969af 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -396,7 +396,6 @@ class FormulaAuditor
return if formula.tap.nil? || !formula.tap.official?
name = formula.name
- full_name = formula.full_name
if Homebrew::MissingFormula.blacklisted_reason(name)
problem "'#{name}' is blacklisted."
@@ -412,35 +411,10 @@ class FormulaAuditor
return
end
- if !formula.core_formula? && Formula.core_names.include?(name)
- problem "Formula name conflicts with existing core formula."
- return
- end
-
- @@local_official_taps_name_map ||= Tap.select(&:official?).flat_map(&:formula_names)
- .each_with_object({}) do |tap_formula_full_name, name_map|
- next if tap_formula_full_name.start_with?("homebrew/science/")
- tap_formula_name = tap_formula_full_name.split("/").last
- name_map[tap_formula_name] ||= []
- name_map[tap_formula_name] << tap_formula_full_name
- name_map
- end
-
- same_name_tap_formulae = @@local_official_taps_name_map[name] || []
-
- if @online
- Homebrew.search_taps(name, silent: true).each do |tap_formula_full_name|
- next if tap_formula_full_name.start_with?("homebrew/science/")
- tap_formula_name = tap_formula_full_name.split("/").last
- next if tap_formula_name != name
- same_name_tap_formulae << tap_formula_full_name
- end
- end
-
- same_name_tap_formulae.delete(full_name)
+ return if formula.core_formula?
+ return unless Formula.core_names.include?(name)
- return if same_name_tap_formulae.empty?
- problem "Formula name conflicts with #{same_name_tap_formulae.join ", "}"
+ problem "Formula name conflicts with existing core formula."
end
def audit_deps