From be45e6a0c52b02508aef17f0a9b16ebf6976d006 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 25 Sep 2015 14:37:50 +0100 Subject: [PATCH] migrator: link Cellar and opt before the keg. When there's absolute symlinks in a linked directory in the `keg` (e.g. `bin`)that point to the `Cellar` or `opt` then linking the `keg` will fail before the `Cellar` or `opt` has been linked. Closes Homebrew/homebrew#44306. Closes Homebrew/homebrew#44329. Signed-off-by: Mike McQuaid --- Library/Homebrew/migrator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/migrator.rb b/Library/Homebrew/migrator.rb index 1ef554a398..3418073d0a 100644 --- a/Library/Homebrew/migrator.rb +++ b/Library/Homebrew/migrator.rb @@ -163,9 +163,9 @@ class Migrator unlink_oldname move_to_new_directory repin - link_newname unless old_linked_keg.nil? - link_oldname_opt link_oldname_cellar + link_oldname_opt + link_newname unless old_linked_keg.nil? update_tabs rescue Interrupt ignore_interrupts { backup_oldname }