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

Revert "audit: check for version aliases."

Browse Source
This commit is contained in:
ilovezfs 2017-02-21 11:31:18 -08:00 committed by GitHub
parent b6a161bc67
commit b59bf2ff64
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Homebrew/dev-cmd/audit.rb
View File

@ -295,27 +295,6 @@ class FormulaAuditor
problem "File should end with a newline" unless text.trailing_newline?
versioned_formulae = Dir[formula.path.to_s.gsub(/\.rb$/, "@*.rb")]
needs_versioned_alias = !versioned_formulae.empty? &&
formula.tap &&
formula.aliases.grep(/.@\d/).empty?
if needs_versioned_alias
_, last_alias_version = File.basename(versioned_formulae.sort.reverse.first)
.gsub(/\.rb$/, "")
.split("@")
major, minor, = formula.version.to_s.split(".")
alias_name = if last_alias_version.split(".").length == 1
"#{formula.name}@#{major}"
else
"#{formula.name}@#{major}.#{minor}"
end
problem <<-EOS.undent
Formula has other versions so create an alias:
cd #{formula.tap.alias_dir}
ln -s #{formula.path.to_s.gsub(formula.tap.path, "..")} #{alias_name}
EOS
end
return unless @strict
present = audit_components
@ -431,8 +410,7 @@ class FormulaAuditor
problem "Dependency '#{dep.name}' was renamed; use new name '#{dep_f.name}'."
end
if @@aliases.include?(dep.name) &&
(core_formula? || !dep_f.versioned_formula?)
if @@aliases.include?(dep.name)
problem "Dependency '#{dep.name}' is an alias; use the canonical name '#{dep.to_formula.full_name}'."
end

19
Library/Homebrew/readall.rb
View File

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