From 919adcc216a090cabf9add72946ed788572f6586 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 26 Jul 2020 09:45:18 +0200 Subject: [PATCH] Pass `args` in `update-report` instead of using global `args`. --- Library/Homebrew/cmd/update-report.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index c9127e81d8..abe5cc1c75 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -104,7 +104,7 @@ module Homebrew end if reporter.updated? updated_taps << tap.name - hub.add(reporter) + hub.add(reporter, preinstall: args.preinstall?) end end @@ -186,7 +186,7 @@ class Reporter raise ReporterRevisionUnsetError, current_revision_var if @current_revision.empty? end - def report + def report(preinstall: false) return @report if @report @report = Hash.new { |h, k| h[k] = [] } @@ -223,7 +223,7 @@ class Reporter name = tap.formula_file_to_name(src) # Skip reporting updated formulae to speed up automatic updates. - if Homebrew.args.preinstall? + if preinstall @report[:M] << name next end @@ -425,9 +425,9 @@ class ReporterHub @hash.fetch(key, []) end - def add(reporter) + def add(reporter, preinstall: false) @reporters << reporter - report = reporter.report.delete_if { |_k, v| v.empty? } + report = reporter.report(preinstall: preinstall).delete_if { |_k, v| v.empty? } @hash.update(report) { |_key, oldval, newval| oldval.concat(newval) } end