From 8749ecc3839c6093f56c6b80ebf794266a611472 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sat, 6 Feb 2016 13:32:12 +0800 Subject: [PATCH] Dependency.expand: ensure pop stack During the dependencies expansion, there may be errors (e.g. FormulaUnavaiableError). As result, some deps will be left behind in the stack and interfere afterwards dependencies expansion. So let's ensure stack clean for each expansions. Fixes Homebrew/homebrew#48834. --- Library/Homebrew/dependency.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index ca500faefa..c280034a84 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -95,8 +95,9 @@ class Dependency end end - @expand_stack.pop merge_repeats(expanded_deps) + ensure + @expand_stack.pop end def action(dependent, dep, &_block)