aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilovezfs2018-03-02 09:53:02 -0800
committerGitHub2018-03-02 09:53:02 -0800
commit0ebb5b285719aef2654696aa488c4929d6c42a09 (patch)
tree36abb8234f356f57e8c8468104088da90a8fc65a
parentdb7f0734c9c0e6db94a33a7c940fdef87c81319b (diff)
parentb4c268e3c59f011f2de7ba0f1a466d54a4ccd97c (diff)
downloadbrew-0ebb5b285719aef2654696aa488c4929d6c42a09.tar.bz2
Merge pull request #3862 from MikeMcQuaid/migrator-overwrite
migrator: overwrite by default.
-rw-r--r--Library/Homebrew/migrator.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/migrator.rb b/Library/Homebrew/migrator.rb
index 8664d474b..3ccf2f23c 100644
--- a/Library/Homebrew/migrator.rb
+++ b/Library/Homebrew/migrator.rb
@@ -288,7 +288,8 @@ class Migrator
new_keg.remove_linked_keg_record if new_keg.linked?
begin
- new_keg.link
+ mode = OpenStruct.new(overwrite: true)
+ new_keg.link(mode)
rescue Keg::ConflictError => e
onoe "Error while executing `brew link` step on #{newname}"
puts e