aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorXu Cheng2016-02-26 15:33:27 +0800
committerXu Cheng2016-02-26 17:00:17 +0800
commitb52af53e711d442f2b7097a449a6c077664eb7f3 (patch)
tree20f09c893a43311bbb5b3c87732a5021aeec5511 /Library/Homebrew/cmd
parent73b79de7bcd97e10c8d3719988bf08f94373872f (diff)
downloadbrew-b52af53e711d442f2b7097a449a6c077664eb7f3.tar.bz2
various: use Tap abstraction
formula_rename and tap_migrations are now handled inside Tap. Closes Homebrew/homebrew#49549. Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/audit.rb8
-rw-r--r--Library/Homebrew/cmd/migrate.rb1
2 files changed, 3 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 342666f8e..a3643e7a6 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -4,10 +4,8 @@ require "utils"
require "extend/ENV"
require "formula_cellar_checks"
require "official_taps"
-require "tap_migrations"
require "cmd/search"
require "date"
-require "formula_renames"
module Homebrew
def audit
@@ -898,11 +896,11 @@ class FormulaAuditor
end
def audit_reverse_migration
- # Only enforce for new formula being re-added to core
+ # Only enforce for new formula being re-added to core and official taps
return unless @strict
- return unless formula.core_formula?
+ return unless formula.tap && formula.tap.official?
- if TAP_MIGRATIONS.key?(formula.name)
+ if formula.tap.tap_migrations.key?(formula.name)
problem <<-EOS.undent
#{formula.name} seems to be listed in tap_migrations.rb!
Please remove #{formula.name} from present tap & tap_migrations.rb
diff --git a/Library/Homebrew/cmd/migrate.rb b/Library/Homebrew/cmd/migrate.rb
index 97f21f78c..b3562b14a 100644
--- a/Library/Homebrew/cmd/migrate.rb
+++ b/Library/Homebrew/cmd/migrate.rb
@@ -1,5 +1,4 @@
require "migrator"
-require "formula_renames"
module Homebrew
def migrate