cleaner: use ObserverPathnameExtension

1 files changed, 3 insertions, 8 deletions

diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 5a54f88b0..437b56628 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -8,6 +8,8 @@ class Cleaner
 
   # Create a cleaner for the given formula and clean its keg
   def initialize f
+    ObserverPathnameExtension.reset_counts!
+
     @f = f
     [f.bin, f.sbin, f.lib].select{ |d| d.exist? }.each{ |d| clean_dir d }
 
@@ -72,7 +74,7 @@ class Cleaner
   # Clean a single folder (non-recursively)
   def clean_dir d
     d.find do |path|
-      path.extend(NoisyPathname) if ARGV.verbose?
+      path.extend(ObserverPathnameExtension)
 
       Find.prune if @f.skip_clean? path
 
@@ -90,10 +92,3 @@ class Cleaner
   end
 
 end
-
-module NoisyPathname
-  def unlink
-    puts "rm: #{self}"
-    super
-  end
-end