From 95e6a634b4856df4873c56f11f1b3036e7610163 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 3 Jan 2014 21:51:23 +0000 Subject: tap: never throw AlreadyTappedError. Just make it a warning instead. Closes Homebrew/homebrew#25511. Closes Homebrew/homebrew#25617. --- Library/Homebrew/cmd/tap.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb index f599f7762..c2dbd0f9d 100644 --- a/Library/Homebrew/cmd/tap.rb +++ b/Library/Homebrew/cmd/tap.rb @@ -10,7 +10,7 @@ module Homebrew extend self elsif ARGV.first == "--repair" repair_taps else - install_tap(*tap_args) + opoo "Already tapped!" unless install_tap(*tap_args) end end @@ -23,7 +23,7 @@ module Homebrew extend self # we downcase to avoid case-insensitive filesystem issues tapd = HOMEBREW_LIBRARY/"Taps/#{user.downcase}-#{repo.downcase}" - raise AlreadyTappedError if tapd.directory? + return false if tapd.directory? abort unless system "git clone https://github.com/#{repouser}/homebrew-#{repo} #{tapd}" files = [] @@ -46,6 +46,8 @@ module Homebrew extend self puts " git remote set-url origin git@github.com:#{repouser}/homebrew-#{repo}.git" puts end + + true end def link_tap_formula formulae -- cgit v1.2.3