From 1818799634c433c476b07262bfc8a246863b0445 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 9 Jan 2015 22:33:57 +0800 Subject: [PATCH] test-bot: unlink conflict formulae during the test Closes Homebrew/homebrew#35697. Signed-off-by: Mike McQuaid --- Library/Homebrew/cmd/test-bot.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 8d49f7df8e..ce704100eb 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -447,6 +447,10 @@ module Homebrew unless dependent.installed? test "brew", "fetch", "--retry", dependent.name next if steps.last.failed? + conflicts = dependent.conflicts.map { |c| Formulary.factory(c.name) }.select { |f| f.installed? } + conflicts.each do |conflict| + test "brew", "unlink", conflict.name + end test "brew", "install", dependent.name next if steps.last.failed? end