From 2ecd73bca4cee61096e076e7c15fd6e8ae928d6d Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Tue, 20 Sep 2016 09:07:02 +0100
Subject: update-report: migrate on newer auto-update.

If we have a `brew.sh` which has set
`HOMEBREW_ENABLE_AUTO_UPDATE_MIGRATION` then let's allow an auto-update
migration. That's because it contains the fix below it _before_ the
update happened which means the auto-update won't fail in the same way
as if updating from an old version.
---
 Library/Homebrew/cmd/update-report.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 1d58018b3..b096dfc3b 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -100,7 +100,8 @@ module Homebrew
     Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"]
 
     # This should always be the last thing to run (but skip on auto-update).
-    unless ARGV.include?("--preinstall")
+    if !ARGV.include?("--preinstall") ||
+       ENV["HOMEBREW_ENABLE_AUTO_UPDATE_MIGRATION"]
       migrate_legacy_repository_if_necessary
     end
   end
-- 
cgit v1.2.3