From 0cb960951f73bc2f8f90506542ac8565e852602a Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Tue, 29 May 2018 10:54:57 +0200 Subject: [PATCH] Fix tap unavailable error for migrated Cask taps. --- Library/Homebrew/compat/tap.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/compat/tap.rb b/Library/Homebrew/compat/tap.rb index 13c667f286..e7953fe461 100644 --- a/Library/Homebrew/compat/tap.rb +++ b/Library/Homebrew/compat/tap.rb @@ -13,11 +13,13 @@ class Tap old_name = name old_path = path - old_remote = remote + old_remote = path.git_origin clear_cache super(new_user, new_repo) + return unless old_path.directory? + new_initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{repo_var}" new_current_revision_var = "HOMEBREW_UPDATE_AFTER#{repo_var}" @@ -30,14 +32,14 @@ class Tap ohai "Migrating tap #{old_name} to #{new_name}..." if $stdout.tty? + if old_path.git? + puts "Changing remote from #{old_remote} to #{new_remote}..." if $stdout.tty? + old_path.git_origin = new_remote + end + puts "Moving #{old_path} to #{new_path}..." if $stdout.tty? path.dirname.mkpath FileUtils.mv old_path, new_path - - return unless old_path.git? - - puts "Changing remote from #{old_remote} to #{new_remote}..." if $stdout.tty? - new_path.git_origin = new_remote end end