diff options
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 1e2d77b2c..4f8708a4d 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -32,11 +32,11 @@ class FormulaInstaller attr_reader :formula attr_accessor :options, :build_bottle, :invalid_option_names - attr_accessor :installed_as_dependency, :installed_on_request + attr_accessor :installed_as_dependency, :installed_on_request, :link_keg mode_attr_accessor :show_summary_heading, :show_header mode_attr_accessor :build_from_source, :force_bottle mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git - mode_attr_accessor :verbose, :debug, :quieter, :link_keg + mode_attr_accessor :verbose, :debug, :quieter def initialize(formula) @formula = formula @@ -149,7 +149,7 @@ class FormulaInstaller recursive_deps = formula.recursive_dependencies recursive_formulae = recursive_deps.map(&:to_formula) - recursive_runtime_deps = formula.recursive_dependencies.reject(&:build?) + recursive_runtime_deps = formula.runtime_dependencies recursive_runtime_formulae = recursive_runtime_deps.map(&:to_formula) recursive_dependencies = [] @@ -553,18 +553,18 @@ class FormulaInstaller end fi = FormulaInstaller.new(df) - fi.options |= tab.used_options - fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) - fi.options |= inherited_options - fi.options &= df.options - fi.build_from_source = ARGV.build_formula_from_source?(df) - fi.force_bottle = false - fi.verbose = verbose? - fi.quieter = quieter? - fi.debug = debug? - fi.link_keg = keg_was_linked if keg_had_linked_keg + fi.options |= tab.used_options + fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) + fi.options |= inherited_options + fi.options &= df.options + fi.build_from_source = ARGV.build_formula_from_source?(df) + fi.force_bottle = false + fi.verbose = verbose? + fi.quieter = quieter? + fi.debug = debug? + fi.link_keg ||= keg_was_linked if keg_had_linked_keg fi.installed_as_dependency = true - fi.installed_on_request = false + fi.installed_on_request = df.any_version_installed? && tab.installed_on_request fi.prelude oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}" fi.install |