From 1f128331b61e50cb9e3c50b759cd1f328960061d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 20 Sep 2016 08:02:52 +0100 Subject: [PATCH 1/2] update-report: don't migrate on auto-update. --- Library/Homebrew/cmd/update-report.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index c37a181c9b..e6a3f8ced8 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -99,8 +99,10 @@ module Homebrew Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"] - # This should always be the last thing to run - migrate_legacy_repository_if_necessary + # This should always be the last thing to run (but skip on auto-update). + unless ARGV.include?("--preinstall") + migrate_legacy_repository_if_necessary + end end private From 8bf405e5f78a9537ce8637e87b0f3e33cbbbd3bb Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 20 Sep 2016 08:03:06 +0100 Subject: [PATCH 2/2] update-report: print message on completion link failure. --- Library/Homebrew/cmd/update-report.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index e6a3f8ced8..1d58018b36 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -302,6 +302,11 @@ module Homebrew link_src_dst_dirs(repository/"share/zsh/site-functions", HOMEBREW_PREFIX/"share/zsh/site-functions", command) link_path_manpages(repository/"share", command) + rescue => e + ofail <<-EOS.undent + Failed to link all completions, docs and manpages: + #{e} + EOS end end