From 1a0f64d5f8d775fd5a6e22b566404a3245022c02 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Mon, 19 Oct 2015 21:50:12 +0800 Subject: [PATCH] test-bot: don't use `--build-bottle` flag if bottle disabled --- Library/Homebrew/cmd/test-bot.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 38e267f9dc..9997b7eee3 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -547,13 +547,13 @@ module Homebrew test "brew", "postinstall", *changed_dependences end formula_fetch_options = [] - formula_fetch_options << "--build-bottle" unless ARGV.include? "--fast" + formula_fetch_options << "--build-bottle" if !ARGV.include?("--fast") && !formula.bottle_disabled? formula_fetch_options << "--force" if ARGV.include? "--cleanup" formula_fetch_options << canonical_formula_name test "brew", "fetch", "--retry", *formula_fetch_options test "brew", "uninstall", "--force", canonical_formula_name if formula.installed? install_args = ["--verbose"] - install_args << "--build-bottle" unless ARGV.include? "--fast" + install_args << "--build-bottle" if !ARGV.include?("--fast") && !formula.bottle_disabled? install_args << "--HEAD" if ARGV.include? "--HEAD" # Pass --devel or --HEAD to install in the event formulae lack stable. Supports devel-only/head-only.