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

Remove requested? dependency magic

Browse Source
This commit is contained in:
Jack Nagel 2014-02-27 14:22:42 -06:00
parent 750b843edc
commit e9b687070a
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dependency.rb
View File

@ -36,10 +36,6 @@ class Dependency
to_formula.installed? to_formula.installed?
end end
def requested?
ARGV.formulae.include?(to_formula) rescue false
end
def satisfied? def satisfied?
installed? && missing_options.empty? installed? && missing_options.empty?
end end

9
Library/Homebrew/formula_installer.rb
View File

@ -263,13 +263,10 @@ class FormulaInstaller
oh1 "Installing dependencies for #{f}: #{Tty.green}#{deps*", "}#{Tty.reset}" oh1 "Installing dependencies for #{f}: #{Tty.green}#{deps*", "}#{Tty.reset}"
end end
deps.each do |dep| ARGV.filter_for_dependencies do
if dep.requested? deps.each { |dep| install_dependency(dep) }
install_dependency(dep)
else
ARGV.filter_for_dependencies { install_dependency(dep) }
end
end end
@show_header = true unless deps.empty? @show_header = true unless deps.empty?
end end