From 9b611be75976f0e993e7a80018fd514a9600f490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?= <70830482+FnControlOption@users.noreply.github.com> Date: Wed, 24 Nov 2021 11:37:34 -0800 Subject: [PATCH] Print given argument instead of rename if matching keg not found --- Library/Homebrew/cli/named_args.rb | 2 +- Library/Homebrew/cmd/migrate.rb | 2 +- Library/Homebrew/uninstall.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb index fd32edb3b5..f5bf30eb67 100644 --- a/Library/Homebrew/cli/named_args.rb +++ b/Library/Homebrew/cli/named_args.rb @@ -316,7 +316,7 @@ module Homebrew rack = Formulary.to_rack(name.downcase) kegs = rack.directory? ? rack.subdirs.map { |d| Keg.new(d) } : [] - raise NoSuchKegError, rack.basename if kegs.none? + raise NoSuchKegError, name if kegs.none? [rack, kegs] end diff --git a/Library/Homebrew/cmd/migrate.rb b/Library/Homebrew/cmd/migrate.rb index 1a9b944c5e..5ed383159a 100644 --- a/Library/Homebrew/cmd/migrate.rb +++ b/Library/Homebrew/cmd/migrate.rb @@ -29,7 +29,7 @@ module Homebrew def migrate args = migrate_args.parse - args.named.to_default_kegs.each do |keg| + args.named.to_kegs.each do |keg| f = Formulary.from_keg(keg) if f.oldname diff --git a/Library/Homebrew/uninstall.rb b/Library/Homebrew/uninstall.rb index 5f662bfe73..1d9a1585e4 100644 --- a/Library/Homebrew/uninstall.rb +++ b/Library/Homebrew/uninstall.rb @@ -36,7 +36,7 @@ module Homebrew f = Formulary.from_rack(rack) if f.pinned? onoe "#{f.full_name} is pinned. You must unpin it to uninstall." - next + break # exit keg loop and move on to next rack end rescue nil