diff options
| author | Xu Cheng | 2016-02-06 13:32:12 +0800 | 
|---|---|---|
| committer | Xu Cheng | 2016-02-07 14:58:05 +0800 | 
| commit | 8749ecc3839c6093f56c6b80ebf794266a611472 (patch) | |
| tree | cec1036a59b0f352fd0c165f10a715ebfac4d58d | |
| parent | e94546121284c6178385ebb2a74a84d04632ce51 (diff) | |
| download | brew-8749ecc3839c6093f56c6b80ebf794266a611472.tar.bz2 | |
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.
| -rw-r--r-- | Library/Homebrew/dependency.rb | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index ca500faef..c280034a8 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) | 
