Merge pull request #1037 from MikeMcQuaid/auto-update-migration-sometimes

update-report: migrate on newer auto-update.

Library/Homebrew/brew.sh

@@ -267,6 +267,9 @@ update-preinstall() {
   [[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return
   [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return
 
+  # Allow auto-update migration now we have a fix in place (below in this function).
+  export HOMEBREW_ENABLE_AUTO_UPDATE_MIGRATION="1"
+
   if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]]
   then
     brew update --preinstall

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