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

uses: restore formula-level exception handler

Browse Source 
This is a temporary measure until:

- #1862 is merged
- I can a test on `brew uses` against every formula in the official
  taps to verify that exceptions are no longer raised.
This commit is contained in:
Alyssa Ross 2017-01-16 23:23:09 +00:00
parent 0b216798bb
commit 9475622c07
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Library/Homebrew/cmd/uses.rb
View File

@ -47,49 +47,54 @@ module Homebrew
uses = formulae.select do |f| uses = formulae.select do |f|
used_formulae.all? do |ff| used_formulae.all? do |ff|
if recursive begin
deps = f.recursive_dependencies do |dependent, dep| if recursive
if dep.recommended? deps = f.recursive_dependencies do |dependent, dep|
Dependency.prune if ignores.include?("recommended?") || dependent.build.without?(dep) if dep.recommended?
elsif dep.optional? Dependency.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
Dependency.prune if !includes.include?("optional?") && !dependent.build.with?(dep) elsif dep.optional?
elsif dep.build? Dependency.prune if !includes.include?("optional?") && !dependent.build.with?(dep)
Dependency.prune unless includes.include?("build?") elsif dep.build?
end Dependency.prune unless includes.include?("build?")
end
# If a tap isn't installed, we can't find the dependencies of one # If a tap isn't installed, we can't find the dependencies of one
# its formulae, and an exception will be thrown if we try. # its formulae, and an exception will be thrown if we try.
if dep.is_a?(TapDependency) && !dep.tap.installed? if dep.is_a?(TapDependency) && !dep.tap.installed?
Dependency.keep_but_prune_recursive_deps Dependency.keep_but_prune_recursive_deps
end
end
reqs = f.recursive_requirements do |dependent, req|
if req.recommended?
Requirement.prune if ignores.include?("recommended?") || dependent.build.without?(req)
elsif req.optional?
Requirement.prune if !includes.include?("optional?") && !dependent.build.with?(req)
elsif req.build?
Requirement.prune unless includes.include?("build?")
end
end
else
deps = f.deps.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) } && !includes.any? { |include| dep.send(include) }
end
reqs = f.requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) } && !includes.any? { |include| req.send(include) }
end end
end end
reqs = f.recursive_requirements do |dependent, req| next true if deps.any? do |dep|
if req.recommended? begin
Requirement.prune if ignores.include?("recommended?") || dependent.build.without?(req) dep.to_formula.full_name == ff.full_name
elsif req.optional? rescue
Requirement.prune if !includes.include?("optional?") && !dependent.build.with?(req) dep.name == ff.name
elsif req.build?
Requirement.prune unless includes.include?("build?")
end end
end end
else
deps = f.deps.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) } && !includes.any? { |include| dep.send(include) }
end
reqs = f.requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) } && !includes.any? { |include| req.send(include) }
end
end
next true if deps.any? do |dep|
begin
dep.to_formula.full_name == ff.full_name
rescue
dep.name == ff.name
end
end
reqs.any? do |req| reqs.any? do |req|
req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula) req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula)
end
rescue FormulaUnavailableError
# Silently ignore this case as we don't care about things used in
# taps that aren't currently tapped.
end end
end end
end end