From a60eed48bcff30d309ce10f62260c8e92bd691a9 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Sat, 8 Jun 2013 23:09:44 -0700 Subject: [PATCH] Remove adamv-alt references. Closes Homebrew/homebrew#20364. --- Library/Homebrew/cmd/update.rb | 9 --------- Library/Homebrew/extend/pathname.rb | 8 -------- 2 files changed, 17 deletions(-) diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 95125d33ce..6f4992deee 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -2,9 +2,6 @@ require 'cmd/tap' require 'cmd/untap' module Homebrew extend self - - DEPRECATED_TAPS = ['adamv-alt'] - def update unless ARGV.named.empty? abort <<-EOS.undent @@ -28,12 +25,6 @@ module Homebrew extend self Dir["Library/Taps/*"].each do |tapd| next unless File.directory?(tapd) - basename = Pathname.new(tapd).basename.to_s - if DEPRECATED_TAPS.include?(basename) - opoo "#{basename} is deprecated; please untap it" - next - end - cd tapd do begin updater = Updater.new diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index b6a47d5204..1b0bf8b27b 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -344,14 +344,6 @@ class Pathname end def find_formula - # remove special casing once tap is established and alt removed - if self == HOMEBREW_LIBRARY/"Taps/adamv-alt" - all_formula do |file| - yield file - end - return - end - [self/:Formula, self/:HomebrewFormula, self].each do |d| if d.exist? d.children.map{ |child| child.relative_path_from(self) }.each do |pn|