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

Remove some obsoleted hacks from the installer

Browse Source
This commit is contained in:
Jack Nagel 2014-03-10 14:56:02 -05:00
parent 9bc8d0820e
commit 2182ce4d16
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula_installer.rb
View File

@ -247,10 +247,6 @@ class FormulaInstaller
end
def expand_dependencies(deps)
# FIXME: can't check this inside the block for the top-level dependent
# because it depends on the contents of ARGV.
pour_bottle = pour_bottle?
inherited_options = {}
expanded_deps = ARGV.filter_for_dependencies do
@ -260,7 +256,7 @@ class FormulaInstaller
if (dep.optional? || dep.recommended?) && build.without?(dep)
Dependency.prune
elsif dep.build? && dependent == f && pour_bottle
elsif dep.build? && dependent == f && pour_bottle?
Dependency.prune
elsif dep.build? && dependent != f && install_bottle?(dependent)
Dependency.prune
@ -401,7 +397,7 @@ class FormulaInstaller
def build_argv
opts = Options.coerce(sanitized_ARGV_options)
opts.concat(options)
opts << Option.new("--build-from-source") # don't download bottle
opts
end
def build