From f6937743237b723bf8ca11286ffa682d559c6cc9 Mon Sep 17 00:00:00 2001
From: Steven Peters
Date: Mon, 20 Jun 2016 00:53:56 -0700
Subject: test-bot: check for conflicts in dependencies (#379)

---
 Library/Homebrew/dev-cmd/test-bot.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Library/Homebrew/dev-cmd')

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 754123d5a..3c784d8df 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -593,6 +593,9 @@ module Homebrew
             test "brew", "fetch", "--retry", dependent.name
             next if steps.last.failed?
             conflicts = dependent.conflicts.map { |c| Formulary.factory(c.name) }.select(&:installed?)
+            dependent.recursive_dependencies.each do |dependency|
+              conflicts += dependency.to_formula.conflicts.map { |c| Formulary.factory(c.name) }.select(&:installed?)
+            end
             conflicts.each do |conflict|
               test "brew", "unlink", conflict.name
             end
-- 
cgit v1.2.3