From 651cef6f6be613af41d23bea0e1815fcca415ffa Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Mon, 16 Oct 2023 22:20:48 +0200 Subject: [PATCH 1/2] brew unbottled: skip deprecated formulae We are not interested in bottling them --- Library/Homebrew/dev-cmd/unbottled.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Library/Homebrew/dev-cmd/unbottled.rb b/Library/Homebrew/dev-cmd/unbottled.rb index 0d3e6201f9..b628f245bb 100644 --- a/Library/Homebrew/dev-cmd/unbottled.rb +++ b/Library/Homebrew/dev-cmd/unbottled.rb @@ -137,6 +137,10 @@ module Homebrew all_formulae = Formula.all(eval_all: args.eval_all?) end + # Remove deprecated formulae as we do not care if they are unbottled + formulae = formulae&.select {|formula| !(formula.deprecated?)} + all_formulae = all_formulae&.select {|formula| !(formula.deprecated?)} + [formulae, all_formulae, formula_installs] end From f656f8db97ab629633590db74d8834f9469dde8b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 18 Oct 2023 08:52:25 +0100 Subject: [PATCH 2/2] dev-cmd/unbottled: more idiomatic Ruby. --- Library/Homebrew/dev-cmd/unbottled.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/unbottled.rb b/Library/Homebrew/dev-cmd/unbottled.rb index b628f245bb..484c9c4002 100644 --- a/Library/Homebrew/dev-cmd/unbottled.rb +++ b/Library/Homebrew/dev-cmd/unbottled.rb @@ -138,8 +138,8 @@ module Homebrew end # Remove deprecated formulae as we do not care if they are unbottled - formulae = formulae&.select {|formula| !(formula.deprecated?)} - all_formulae = all_formulae&.select {|formula| !(formula.deprecated?)} + formulae = Array(formulae).reject(&:deprecated?) if formulae.present? + all_formulae = Array(all_formulae).reject(&:deprecated?) if all_formulae.present? [formulae, all_formulae, formula_installs] end