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

Merge pull request #2108 from MikeMcQuaid/readall-shadowed-aliases

Browse Source 
readall: check for shadowed aliases.
This commit is contained in:
Mike McQuaid 2017-04-22 18:24:22 +01:00 committed by GitHub
commit a1b8d4179c
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Library/Homebrew/readall.rb
View File

@ -24,14 +24,21 @@ module Readall
!failed !failed
end end
def valid_aliases?(alias_dirs) def valid_aliases?(alias_dir, formula_dir)
return false unless alias_dir.directory?
failed = false failed = false
alias_dirs.each do |alias_dir| alias_dir.each_child do |f|
next unless alias_dir.directory? if !f.symlink?
alias_dir.children.each do |f| onoe "Non-symlink alias: #{f}"
next unless f.symlink? failed = true
next if f.file? elsif !f.file?
onoe "Broken alias: #{f}" onoe "Non-file alias: #{f}"
failed = true
end
if (formula_dir/"#{f.basename}.rb").exist?
onoe "Formula duplicating alias: #{f}"
failed = true failed = true
end end
end end
@ -57,7 +64,7 @@ module Readall
def valid_tap?(tap, options = {}) def valid_tap?(tap, options = {})
failed = false failed = false
if options[:aliases] if options[:aliases]
valid_aliases = valid_aliases?([tap.alias_dir]) valid_aliases = valid_aliases?(tap.alias_dir, tap.formula_dir)
failed = true unless valid_aliases failed = true unless valid_aliases
end end
valid_formulae = valid_formulae?(tap.formula_files) valid_formulae = valid_formulae?(tap.formula_files)