Merge pull request #432 from cho-m/remove-merged_output

cmd/generate-analytics-api: remove merged_output
Homebrew · Mar 20, 2024 · 0f9a473 · 0f9a473
2 parents 8d055c2 + 4bbd62a
commit 0f9a473
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmd/generate-analytics-api.rb b/cmd/generate-analytics-api.rb
@@ -44,18 +44,18 @@ def run_formula_analytics(*args)
     puts "brew formula-analytics #{args.join(" ")}"
 
     retries = 0
-    result = Utils.popen_read(HOMEBREW_BREW_FILE, "formula-analytics", *args)
+    result = Utils.popen_read(HOMEBREW_BREW_FILE, "formula-analytics", *args, err: :err)
 
     while !$CHILD_STATUS.success? && retries < MAX_RETRIES
       # Give InfluxDB some more breathing room.
       sleep 4**(retries+2)
 
       retries += 1
       puts "Retrying #{args.join(" ")} (#{retries}/#{MAX_RETRIES})..."
-      result = Utils.popen_read(HOMEBREW_BREW_FILE, "formula-analytics", *args)
+      result = Utils.popen_read(HOMEBREW_BREW_FILE, "formula-analytics", *args, err: :err)
     end
 
-    odie "`brew formula-analytics #{args.join(" ")}` failed: #{result.merged_output}" unless $CHILD_STATUS.success?
+    odie "`brew formula-analytics #{args.join(" ")}` failed: #{result}" unless $CHILD_STATUS.success?
 
     result
   end