From 72cb6ffd1203dda238f53798c5221bb848aa1f57 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 5 Feb 2021 15:03:31 +0000
Subject: [PATCH] utils: import {ohai,puts}_stdout_or_stderr

Fixes #10536
---
 Library/Homebrew/cmd/update-report.rb | 16 ----------------
 Library/Homebrew/utils.rb             | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 0ddf162d1e..3e071d8371 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -15,22 +15,6 @@ module Homebrew
 
   module_function
 
-  def ohai_stdout_or_stderr(message)
-    if $stdout.tty?
-      ohai(message)
-    else
-      $stderr.puts(ohai_title(message))
-    end
-  end
-
-  def puts_stdout_or_stderr(message)
-    if $stdout.tty?
-      puts(message)
-    else
-      $stderr.puts(message)
-    end
-  end
-
   def update_preinstall_header(args:)
     @update_preinstall_header ||= begin
       ohai_stdout_or_stderr "Auto-updated Homebrew!" if args.preinstall?
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 553ed7524c..63824dd53e 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -111,6 +111,22 @@ module Kernel
     puts sput
   end
 
+  def ohai_stdout_or_stderr(message)
+    if $stdout.tty?
+      ohai(message)
+    else
+      $stderr.puts(ohai_title(message))
+    end
+  end
+
+  def puts_stdout_or_stderr(message)
+    if $stdout.tty?
+      puts(message)
+    else
+      $stderr.puts(message)
+    end
+  end
+
   def odebug(title, *sput, always_display: false)
     debug = if respond_to?(:debug)
       debug?