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

Check for metafiles only in the root directory

Browse Source
This commit is contained in:
Naoto Kaneko 2017-02-24 17:44:27 +09:00
parent 56a0afe579
commit ccc9b2dc6d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/keg.rb
View File

@ -207,9 +207,8 @@ class Keg
alias eql? == alias eql? ==
def empty_installation? def empty_installation?
Pathname.glob("#{path}/**/*") do |file| Pathname.glob("#{path}/*") do |file|
return false if file.executable? return false if file.directory? && !file.children.reject(&:ds_store?).empty?
next if file.directory?
basename = file.basename.to_s basename = file.basename.to_s
next if Metafiles.copy?(basename) next if Metafiles.copy?(basename)
next if %w[.DS_Store INSTALL_RECEIPT.json].include?(basename) next if %w[.DS_Store INSTALL_RECEIPT.json].include?(basename)

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

@ -59,6 +59,10 @@ class LinkTests < LinkTestCase
(@keg/"bin").rmtree (@keg/"bin").rmtree
assert_predicate @keg, :empty_installation? assert_predicate @keg, :empty_installation?
(@keg/"bin").mkpath
touch @keg.join("bin", "todo")
refute_predicate @keg, :empty_installation?
end end
def test_linking_keg def test_linking_keg