From 1e487edd21a55c447065a1cce3f6398b119e4669 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Mon, 7 Mar 2016 18:08:37 +0800 Subject: [PATCH] tap various commands: use tap name method. Instead of hard coded `Homebrew/homebrew` --- Library/Homebrew/cmd/tap-info.rb | 2 +- Library/Homebrew/cmd/tap-pin.rb | 4 ++-- Library/Homebrew/cmd/tap-unpin.rb | 4 ++-- Library/Homebrew/cmd/untap.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb index 3d1a0c83d1..0a59341fff 100644 --- a/Library/Homebrew/cmd/tap-info.rb +++ b/Library/Homebrew/cmd/tap-info.rb @@ -10,7 +10,7 @@ module Homebrew end end - raise "Homebrew/homebrew is not allowed" if taps.any?(&:core_tap?) + raise "#{tap} is not allowed" if taps.any?(&:core_tap?) if ARGV.json == "v1" print_tap_json(taps) diff --git a/Library/Homebrew/cmd/tap-pin.rb b/Library/Homebrew/cmd/tap-pin.rb index 7625f2642c..16c3a77dba 100644 --- a/Library/Homebrew/cmd/tap-pin.rb +++ b/Library/Homebrew/cmd/tap-pin.rb @@ -4,9 +4,9 @@ module Homebrew def tap_pin ARGV.named.each do |name| tap = Tap.fetch(name) - raise "Homebrew/homebrew is not allowed" if tap.core_tap? + raise "#{tap} is not allowed" if tap.core_tap? tap.pin - ohai "Pinned #{tap.name}" + ohai "Pinned #{tap}" end end end diff --git a/Library/Homebrew/cmd/tap-unpin.rb b/Library/Homebrew/cmd/tap-unpin.rb index 5bf3bb1788..7a7a52fc82 100644 --- a/Library/Homebrew/cmd/tap-unpin.rb +++ b/Library/Homebrew/cmd/tap-unpin.rb @@ -4,9 +4,9 @@ module Homebrew def tap_unpin ARGV.named.each do |name| tap = Tap.fetch(name) - raise "Homebrew/homebrew is not allowed" if tap.core_tap? + raise "#{tap} is not allowed" if tap.core_tap? tap.unpin - ohai "Unpinned #{tap.name}" + ohai "Unpinned #{tap}" end end end diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb index 52e1e9a18c..2f1b8056ee 100644 --- a/Library/Homebrew/cmd/untap.rb +++ b/Library/Homebrew/cmd/untap.rb @@ -6,7 +6,7 @@ module Homebrew ARGV.named.each do |tapname| tap = Tap.fetch(tapname) - raise "Homebrew/homebrew is not allowed" if tap.core_tap? + raise "#{tap} is not allowed" if tap.core_tap? tap.uninstall end end