From 63e6632aa9f616c60d120761bba94a3cacc3b0e7 Mon Sep 17 00:00:00 2001
From: Bob Wombat Hogg <wombat@rwhogg.site>
Date: Wed, 6 May 2020 08:45:07 -0400
Subject: [PATCH] docs: Update tap-pin and tap-unpin disable explanations
I interpreted the existing message as meaning "you don't pin
a tap any more, rather you pin a specific formula from that
tap". I.e. the command still worked, but it had to be done
on a per-formula basis (eg. `brew tap-pin linuxbrew/xorg/mesa` instead
of just `brew tap-pin linuxbrew/xorg`)
IMO, this makes it clearer that the command itself is no longer
supported.
---
Library/Homebrew/cmd/tap-pin.rb | 4 ++--
Library/Homebrew/cmd/tap-unpin.rb | 4 ++--
Library/Homebrew/formulary.rb | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Library/Homebrew/cmd/tap-pin.rb b/Library/Homebrew/cmd/tap-pin.rb
index 97397a7ef5..b8e7a87365 100644
--- a/Library/Homebrew/cmd/tap-pin.rb
+++ b/Library/Homebrew/cmd/tap-pin.rb
@@ -12,7 +12,7 @@ module Homebrew
end
def tap_pin
- odisabled "brew tap-pin user/tap",
- "fully-scoped user/tap/formula naming"
+ odisabled "the brew tap-pin command",
+ "fully-scoped user/tap/formula naming when installing and in dependency references"
end
end
diff --git a/Library/Homebrew/cmd/tap-unpin.rb b/Library/Homebrew/cmd/tap-unpin.rb
index 07132ec629..2ec6e681a9 100644
--- a/Library/Homebrew/cmd/tap-unpin.rb
+++ b/Library/Homebrew/cmd/tap-unpin.rb
@@ -12,7 +12,7 @@ module Homebrew
end
def tap_unpin
- odisabled "brew tap-pin user/tap",
- "fully-scoped user/tap/formula naming"
+ odisabled "the brew tap-unpin command",
+ "fully-scoped user/tap/formula naming when installing and in dependency references"
end
end
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 83565d1a49..b01973fab6 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -491,8 +491,8 @@ module Formulary
if possible_pinned_tap_formulae.size == 1
selected_formula = factory(possible_pinned_tap_formulae.first, spec)
if core_path(ref).file?
- odisabled "brew tap-pin user/tap",
- "fully-scoped user/tap/formula naming"
+ odisabled "the brew tap-pin command",
+ "fully-scoped user/tap/formula naming when installing and in dependency references"
end
selected_formula
else
--
GitLab