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

linkage_checker: correctly handle multiple taps.

Browse Source 
Fix upgrades of formulae with the same name in multiple taps.

As reported in:
https://github.com/Homebrew/brew/pull/3789#issuecomment-384890624
This commit is contained in:
Mike McQuaid 2018-04-28 17:24:43 +01:00
parent 417fc73aaa
commit 8f3ddf968f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/linkage_checker.rb
View File

@ -111,8 +111,12 @@ class LinkageChecker
formula.build.without?(dep)
end
declared_deps = formula.deps.reject { |dep| filter_out.call(dep) }.map(&:name)
declared_dep_names = declared_deps.map { |dep| dep.split("/").last }
declared_deps_full_names = formula.deps
.reject { |dep| filter_out.call(dep) }
.map(&:name)
declared_deps_names = declared_deps_full_names.map do |dep|
dep.split("/").last
end
recursive_deps = formula.declared_runtime_dependencies.map do |dep|
begin
dep.to_formula.name
@ -127,7 +131,7 @@ class LinkageChecker
name = full_name.split("/").last
next if name == formula.name
if recursive_deps.include?(name)
indirect_deps << full_name unless declared_dep_names.include?(name)
indirect_deps << full_name unless declared_deps_names.include?(name)
else
undeclared_deps << full_name
end
@ -136,9 +140,9 @@ class LinkageChecker
sort_by_formula_full_name!(indirect_deps)
sort_by_formula_full_name!(undeclared_deps)
unnecessary_deps = declared_dep_names.reject do |full_name|
unnecessary_deps = declared_deps_full_names.reject do |full_name|
next true if Formula[full_name].bin.directory?
name = full_name.split("/").last
next true if Formula[name].bin.directory?
@brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name)
end