From fbaa0c35a6668b31b74af3a890d5449a446bb93a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 20 Mar 2019 11:06:45 +0000 Subject: [PATCH] bump-formula-pr: move auto-update to brew.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s always run anyway but this at least means Homebrew/brew and tap code is all up to date before we start querying any objects. Fixes #5876. --- Library/Homebrew/brew.sh | 1 + Library/Homebrew/dev-cmd/bump-formula-pr.rb | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 2cd1677a0e..c37e0c03e5 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -420,6 +420,7 @@ update-preinstall() { [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || + "$HOMEBREW_COMMAND" = "bump-formula-pr" || "$HOMEBREW_COMMAND" = "tap" && $HOMEBREW_ARG_COUNT -gt 1 || "$HOMEBREW_CASK_COMMAND" = "install" || "$HOMEBREW_CASK_COMMAND" = "upgrade" ]] then diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 36c177897f..d9f81e6f85 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -166,12 +166,6 @@ module Homebrew end end - if args.dry_run? - ohai "brew update" - else - safe_system "brew", "update" - end - old_formula_version = formula_version(formula, requested_spec) replacement_pairs = []