1 files changed, 19 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index b7de0005c..2d5e34ce2 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -23,6 +23,7 @@ require "formula"
 require "keg"
 require "tab"
 require "json"
+require "historic"
 
 module Homebrew
   module_function
@@ -54,10 +55,25 @@ module Homebrew
           else
             info_formula Formulary.find_with_priority(f)
           end
-        rescue FormulaUnavailableError
+        rescue FormulaUnavailableError => e
           # No formula with this name, try a blacklist lookup
-          raise unless (blacklist = blacklisted?(f))
-          puts blacklist
+          if (blacklist = blacklisted?(f))
+            ofail "#{e.message}\n#{blacklist}"
+          else
+            ofail e.message
+
+            # No point in searching if the specified tap isn't tapped yet
+            next if e.instance_of?(TapFormulaUnavailableError) && !e.tap.installed?
+
+            migrations = search_for_migrated_formula(f)
+            next unless migrations.empty?
+            ohai "Searching among deleted formulae..."
+            begin
+              search_for_deleted_formula(f)
+            rescue
+              nil
+            end
+          end
         end
       end
     end