admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Synchronize counts for link and unlink (#242)

Browse Source 
Closes #239.
This commit is contained in:
Paolo G. Giarrusso 2016-05-15 13:07:58 +02:00 committed by Mike McQuaid
parent aae447996c
commit 2f20a42292
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/extend/pathname.rb
View File

@ -529,6 +529,11 @@ module ObserverPathnameExtension
ObserverPathnameExtension.n += 1 ObserverPathnameExtension.n += 1
end end
def mkpath
super
puts "mkdir -p #{self}" if ObserverPathnameExtension.verbose?
end
def rmdir def rmdir
super super
puts "rmdir #{self}" if ObserverPathnameExtension.verbose? puts "rmdir #{self}" if ObserverPathnameExtension.verbose?

4
Library/Homebrew/keg.rb
View File

@ -234,7 +234,7 @@ class Keg
dirs.reverse_each(&:rmdir_if_possible) dirs.reverse_each(&:rmdir_if_possible)
end end
ObserverPathnameExtension.total ObserverPathnameExtension.n
end end
def lock def lock
@ -374,7 +374,7 @@ class Keg
unlink unlink
raise raise
else else
ObserverPathnameExtension.total ObserverPathnameExtension.n
end end
def remove_oldname_opt_record def remove_oldname_opt_record

4
Library/Homebrew/test/test_keg.rb
View File

@ -56,7 +56,7 @@ class LinkTests < Homebrew::TestCase
def test_unlinking_keg def test_unlinking_keg
@keg.link @keg.link
assert_predicate @dst, :symlink? assert_predicate @dst, :symlink?
assert_equal 4, @keg.unlink assert_equal 3, @keg.unlink
refute_predicate @dst, :symlink? refute_predicate @dst, :symlink?
end end
@ -239,7 +239,7 @@ class LinkTests < Homebrew::TestCase
def test_unlink_ignores_nonexistent_file def test_unlink_ignores_nonexistent_file
@keg.link @keg.link
@dst.delete @dst.delete
assert_equal 3, @keg.unlink assert_equal 2, @keg.unlink
end end
def test_pkgconfig_is_mkpathed def test_pkgconfig_is_mkpathed