Browse files

Keg#unlink: use ObserverPathnameExtension

#link was using the extension but #unlink wasn't, so the counting
criteria were potentially different and `brew unlink` was ignoring
--verbose.
  • Loading branch information...
1 parent b11de18 commit 2834ccc8dc8a58ca81401c73800f271c08ee156a @mistydemeo mistydemeo committed Oct 4, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 Library/Homebrew/keg.rb
View
10 Library/Homebrew/keg.rb
@@ -27,13 +27,16 @@ def uninstall
end
def unlink
- n=0
+ # these are used by the ObserverPathnameExtension to count the number
+ # of files and directories linked
+ $n=$d=0
%w[bin etc lib include sbin share var].map{ |d| self/d }.each do |src|
next unless src.exist?
src.find do |src|
next if src == self
dst=HOMEBREW_PREFIX+src.relative_path_from(self)
+ dst.extend ObserverPathnameExtension
# check whether the file to be unlinked is from the current keg first
if !dst.symlink? || !dst.exist? || src != dst.resolved_path
@@ -43,12 +46,11 @@ def unlink
dst.uninstall_info if dst.to_s =~ INFOFILE_RX and ENV['HOMEBREW_KEEP_INFO']
dst.unlink
dst.parent.rmdir_if_possible
- n+=1
Find.prune if src.directory?
end
end
linked_keg_record.unlink if linked_keg_record.symlink?
- n
+ $n+$d
end
def fname
@@ -84,8 +86,6 @@ def basename
def link mode=nil
raise "Cannot link #{fname}\nAnother version is already linked: #{linked_keg_record.realpath}" if linked_keg_record.directory?
- # these are used by the ObserverPathnameExtension to count the number
- # of files and directories linked
$n=0
$d=0

0 comments on commit 2834ccc

Please sign in to comment.