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

Pass debug?, quiet? and verbose? to FormulaInstaller.

Browse Source
This commit is contained in:
Markus Reiter 2020-08-02 03:53:30 +02:00
parent 5db764f3cb
commit e9d8f09da1
6 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cask/installer.rb
View File

@ -367,11 +367,10 @@ module Cask
force: false, force: false,
).install ).install
else 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_as_dependency = true
fi.installed_on_request = false fi.installed_on_request = false
fi.show_header = true fi.show_header = true
fi.verbose = verbose?
fi.prelude fi.prelude
fi.fetch fi.fetch
fi.install fi.install

3
Library/Homebrew/cmd/install.rb
View File

@ -325,7 +325,8 @@ module Homebrew
fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?,
include_test_formulae: args.include_test_formulae, 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.options = build_options.used_options
fi.env = args.env fi.env = args.env
fi.force = args.force? fi.force = args.force?

2
Library/Homebrew/cmd/postinstall.rb
View File

@ -24,7 +24,7 @@ module Homebrew
args.resolved_formulae.each do |f| args.resolved_formulae.each do |f|
ohai "Postinstalling #{f}" ohai "Postinstalling #{f}"
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f, debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?)
fi.post_install fi.post_install
end end
end end

25
Library/Homebrew/formula_installer.rb
View File

@ -51,7 +51,8 @@ class FormulaInstaller
force_bottle: false, force_bottle: false,
include_test_formulae: [], include_test_formulae: [],
build_from_source_formulae: [], build_from_source_formulae: [],
cc: nil) cc: nil,
debug: false, quiet: false, verbose: false)
@formula = formula @formula = formula
@env = nil @env = nil
@force = false @force = false
@ -68,9 +69,9 @@ class FormulaInstaller
@interactive = false @interactive = false
@git = false @git = false
@cc = cc @cc = cc
@verbose = Homebrew.args.verbose? @verbose = verbose
@quiet = Homebrew.args.quiet? @quiet = quiet
@debug = Homebrew.args.debug? @debug = debug
@installed_as_dependency = false @installed_as_dependency = false
@installed_on_request = true @installed_on_request = true
@options = Options.new @options = Options.new
@ -601,15 +602,13 @@ class FormulaInstaller
def fetch_dependency(dep) def fetch_dependency(dep)
df = dep.to_formula df = dep.to_formula
fi = FormulaInstaller.new(df, force_bottle: false, fi = FormulaInstaller.new(df, force_bottle: false,
include_test_formulae: include_test_formulae, 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.force = force?
fi.keep_tmp = keep_tmp? 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 # 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 # been done for us in `compute_dependencies` and there's no requirement to
# fetch in a particular order. # fetch in a particular order.
@ -642,9 +641,10 @@ class FormulaInstaller
EOS EOS
end end
fi = FormulaInstaller.new(df, force_bottle: false, fi = FormulaInstaller.new(df, force_bottle: false,
include_test_formulae: include_test_formulae, 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.used_options
fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
@ -652,9 +652,6 @@ class FormulaInstaller
fi.options &= df.options fi.options &= df.options
fi.force = force? fi.force = force?
fi.keep_tmp = keep_tmp? 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.link_keg ||= keg_was_linked if keg_had_linked_keg
fi.installed_as_dependency = true fi.installed_as_dependency = true
fi.installed_on_request = df.any_version_installed? && tab.installed_on_request fi.installed_on_request = df.any_version_installed? && tab.installed_on_request

3
Library/Homebrew/reinstall.rb
View File

@ -24,7 +24,8 @@ module Homebrew
options &= f.options options &= f.options
fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, 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.options = options
fi.force = args.force? fi.force = args.force?
fi.keep_tmp = args.keep_tmp? fi.keep_tmp = args.keep_tmp?

5
Library/Homebrew/upgrade.rb
View File

@ -63,9 +63,8 @@ module Homebrew
options |= f.build.used_options options |= f.build.used_options
options &= f.options options &= f.options
fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?, fi = FormulaInstaller.new(f, force_bottle: args.force_bottle?,
include_test_formulae: args.include_test_formulae, debug: args.debug?, quiet: args.quiet?, verbose: args.verbose?)
build_from_source_formulae: args.build_from_source_formulae)
fi.options = options fi.options = options
fi.force = args.force? fi.force = args.force?
fi.keep_tmp = args.keep_tmp? fi.keep_tmp = args.keep_tmp?