diff options
| author | Mike McQuaid | 2016-09-20 08:21:27 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-20 08:21:27 +0100 |
| commit | f78b737d9bb17f65ca99f0e6b1d20a69e1a977d5 (patch) | |
| tree | c8427bf5d828d13573f660fcf62dfcde3e825150 /Library | |
| parent | 7ef74614e76320c639a319e945c59713fc6a3ccd (diff) | |
| parent | 8bf405e5f78a9537ce8637e87b0f3e33cbbbd3bb (diff) | |
| download | brew-f78b737d9bb17f65ca99f0e6b1d20a69e1a977d5.tar.bz2 | |
Merge pull request #1035 from MikeMcQuaid/no-auto-update-migration
No auto update migration
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update-report.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index c37a181c9..1d58018b3 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 @@ -300,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 |