admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #1035 from MikeMcQuaid/no-auto-update-migration

Browse Source 
No auto update migration
This commit is contained in:
Mike McQuaid 2016-09-20 08:21:27 +01:00 committed by GitHub
commit f78b737d9b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cmd/update-report.rb
View File

@ -99,9 +99,11 @@ module Homebrew
Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"] Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"]
# This should always be the last thing to run # This should always be the last thing to run (but skip on auto-update).
unless ARGV.include?("--preinstall")
migrate_legacy_repository_if_necessary migrate_legacy_repository_if_necessary
end end
end
private private
@ -300,6 +302,11 @@ module Homebrew
link_src_dst_dirs(repository/"share/zsh/site-functions", link_src_dst_dirs(repository/"share/zsh/site-functions",
HOMEBREW_PREFIX/"share/zsh/site-functions", command) HOMEBREW_PREFIX/"share/zsh/site-functions", command)
link_path_manpages(repository/"share", command) link_path_manpages(repository/"share", command)
rescue => e
ofail <<-EOS.undent
Failed to link all completions, docs and manpages:
#{e}
EOS
end end
end end