diff options
| author | Jack Nagel | 2013-08-09 11:29:19 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-08-09 20:50:43 -0500 |
| commit | e4b951520aafc3e5b4e9719d5b38962022f6133e (patch) | |
| tree | 6d8cc444bb06dfeef56bc67d19dec9850a367463 /Library | |
| parent | 1d8a85c0ae6594bd651794928377b5e476037e94 (diff) | |
| download | brew-e4b951520aafc3e5b4e9719d5b38962022f6133e.tar.bz2 | |
Keep track of pruned parent directories
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/keg.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_keg.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 475ecf688..93e8b7857 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -41,8 +41,8 @@ class Keg < Pathname next unless dir.exist? dir.find do |src| next if src == self - dst=HOMEBREW_PREFIX+src.relative_path_from(self) - dst.extend ObserverPathnameExtension + 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 @@ -51,7 +51,7 @@ class Keg < Pathname dst.uninstall_info if dst.to_s =~ INFOFILE_RX and ENV['HOMEBREW_KEEP_INFO'] dst.unlink - dst.parent.rmdir_if_possible + dst.parent.extend(ObserverPathnameExtension).rmdir_if_possible Find.prune if src.directory? end end diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb index da7a58810..de6ffa0d8 100644 --- a/Library/Homebrew/test/test_keg.rb +++ b/Library/Homebrew/test/test_keg.rb @@ -31,7 +31,7 @@ class LinkTests < Test::Unit::TestCase def test_unlinking_keg @keg.link - assert_equal 3, @keg.unlink + assert_equal 4, @keg.unlink end def test_link_dry_run |