diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index cbf5dc389b..5ad75d01ce 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -367,11 +367,10 @@ module Cask force: false, ).install else - FormulaInstaller.new(cask_or_formula).yield_self do |fi| + FormulaInstaller.new(cask_or_formula, verbose: verbose?).yield_self do |fi| fi.installed_as_dependency = true fi.installed_on_request = false fi.show_header = true - fi.verbose = verbose? fi.prelude fi.fetch fi.install diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 607e69ec92..efb73358d6 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -325,7 +325,8 @@ module Homebrew fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, include_test_formulae: args.include_test_formulae, - build_from_source_formulae: args.build_from_source_formulae) + build_from_source_formulae: args.build_from_source_formulae, + debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?) fi.options = build_options.used_options fi.env = args.env fi.force = args.force? diff --git a/Library/Homebrew/cmd/postinstall.rb b/Library/Homebrew/cmd/postinstall.rb index e0ac1d548c..a9da23695f 100644 --- a/Library/Homebrew/cmd/postinstall.rb +++ b/Library/Homebrew/cmd/postinstall.rb @@ -24,7 +24,7 @@ module Homebrew args.resolved_formulae.each do |f| ohai "Postinstalling #{f}" - fi = FormulaInstaller.new(f) + fi = FormulaInstaller.new(f, debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?) fi.post_install end end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 30d7d2c292..0b8d015fe8 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -51,7 +51,8 @@ class FormulaInstaller force_bottle: false, include_test_formulae: [], build_from_source_formulae: [], - cc: nil) + cc: nil, + debug: false, quiet: false, verbose: false) @formula = formula @env = nil @force = false @@ -68,9 +69,9 @@ class FormulaInstaller @interactive = false @git = false @cc = cc - @verbose = Homebrew.args.verbose? - @quiet = Homebrew.args.quiet? - @debug = Homebrew.args.debug? + @verbose = verbose + @quiet = quiet + @debug = debug @installed_as_dependency = false @installed_on_request = true @options = Options.new @@ -601,15 +602,13 @@ class FormulaInstaller def fetch_dependency(dep) df = dep.to_formula - fi = FormulaInstaller.new(df, force_bottle: false, + fi = FormulaInstaller.new(df, force_bottle: false, include_test_formulae: include_test_formulae, - build_from_source_formulae: build_from_source_formulae) + build_from_source_formulae: build_from_source_formulae, + debug: debug?, quiet: quiet?, verbose: verbose?) fi.force = force? fi.keep_tmp = keep_tmp? - fi.verbose = verbose? - fi.quiet = quiet? - fi.debug = debug? # When fetching we don't need to recurse the dependency tree as it's already # been done for us in `compute_dependencies` and there's no requirement to # fetch in a particular order. @@ -642,9 +641,10 @@ class FormulaInstaller EOS end - fi = FormulaInstaller.new(df, force_bottle: false, + fi = FormulaInstaller.new(df, force_bottle: false, include_test_formulae: include_test_formulae, - build_from_source_formulae: build_from_source_formulae) + build_from_source_formulae: build_from_source_formulae, + debug: debug?, quiet: quiet?, verbose: verbose?) fi.options |= tab.used_options fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) @@ -652,9 +652,6 @@ class FormulaInstaller fi.options &= df.options fi.force = force? fi.keep_tmp = keep_tmp? - fi.verbose = verbose? - fi.quiet = quiet? - fi.debug = debug? fi.link_keg ||= keg_was_linked if keg_had_linked_keg fi.installed_as_dependency = true fi.installed_on_request = df.any_version_installed? && tab.installed_on_request diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb index 77645bf7c0..27301429fa 100644 --- a/Library/Homebrew/reinstall.rb +++ b/Library/Homebrew/reinstall.rb @@ -24,7 +24,8 @@ module Homebrew options &= f.options fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, - build_from_source_formulae: args.build_from_source_formulae) + build_from_source_formulae: args.build_from_source_formulae, + debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?) fi.options = options fi.force = args.force? fi.keep_tmp = args.keep_tmp? diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 99a954464e..06e314380f 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -63,9 +63,8 @@ module Homebrew options |= f.build.used_options options &= f.options - fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, - include_test_formulae: args.include_test_formulae, - build_from_source_formulae: args.build_from_source_formulae) + fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, + debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?) fi.options = options fi.force = args.force? fi.keep_tmp = args.keep_tmp?